[openjpa] Fix FTBFS (Resolves: rhbz#1106654)

[Michal Srb]

commit e08af29f43d7fbb54ba365c09ed1462b7122995b
Author: Michal Srb <msrb at redhat.com>
Date:   Tue Feb 17 08:05:14 2015 +0100

    Fix FTBFS (Resolves: rhbz#1106654)

 openjpa-2.2.2-java8-2.patch |   47 +++++++++++++++++++++++++++++++++++++++++++
 openjpa.spec                |   11 +++++++++-
 2 files changed, 57 insertions(+), 1 deletions(-)
---
diff --git a/openjpa-2.2.2-java8-2.patch b/openjpa-2.2.2-java8-2.patch
new file mode 100644
index 0000000..f8bc8f1
--- /dev/null
+++ b/openjpa-2.2.2-java8-2.patch
@@ -0,0 +1,47 @@
+diff --git a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/AnnotationPersistenceMappingParser.java b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/AnnotationPersistenceMappingParser.java
+index 17939e9..2ff8073 100644
+--- a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/AnnotationPersistenceMappingParser.java
++++ b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/AnnotationPersistenceMappingParser.java
+@@ -1578,7 +1578,7 @@ public class AnnotationPersistenceMappingParser
+             }
+             if (xmlRootElementClass != null
+                 && StringUtils.isEmpty(pcols[i].columnDefinition())
+-                && (AccessController.doPrivileged(J2DoPrivHelper
++                && ((Boolean) AccessController.doPrivileged(J2DoPrivHelper
+                     .isAnnotationPresentAction(fm.getDeclaredType(),
+                         xmlRootElementClass))).booleanValue()) {
+                 DBDictionary dict = ((MappingRepository) getRepository())
+diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceXMLMetaDataParser.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceXMLMetaDataParser.java
+index e838b70..20a630d 100644
+--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceXMLMetaDataParser.java
++++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceXMLMetaDataParser.java
+@@ -160,9 +160,9 @@ public class AnnotationPersistenceXMLMetaDataParser {
+     private XMLMetaData parseXMLClassAnnotations(Class<?> cls) {
+         // check immediately whether the class has JAXB XML annotations
+         if (cls == null || xmlTypeClass == null
+-            || !((AccessController.doPrivileged(J2DoPrivHelper
++            || !(((Boolean) AccessController.doPrivileged(J2DoPrivHelper
+                 .isAnnotationPresentAction(cls, xmlTypeClass))).booleanValue()
+-                && (AccessController
++                && ((Boolean) AccessController
+                 .doPrivileged(J2DoPrivHelper.isAnnotationPresentAction(cls,
+                     xmlRootElementClass))).booleanValue()))
+             return null;
+@@ -212,7 +212,7 @@ public class AnnotationPersistenceXMLMetaDataParser {
+         Class superclass = cls.getSuperclass();
+ 
+         // handle inheritance at sub-element level
+-        if ((AccessController.doPrivileged(J2DoPrivHelper
++        if (((Boolean) AccessController.doPrivileged(J2DoPrivHelper
+             .isAnnotationPresentAction(superclass, xmlTypeClass)))
+             .booleanValue())
+             populateFromReflection(superclass, meta);
+@@ -234,7 +234,7 @@ public class AnnotationPersistenceXMLMetaDataParser {
+                     // avoid JAXB XML bind default name
+                     if (StringUtils.equals(XMLMetaData.defaultName, xmlname))
+                         xmlname = member.getName();
+-                    if ((AccessController.doPrivileged(J2DoPrivHelper
++                    if (((Boolean) AccessController.doPrivileged(J2DoPrivHelper
+                         .isAnnotationPresentAction(((Field) member).getType(),
+                             xmlTypeClass))).booleanValue()) {
+                         field = _repos.addXMLClassMetaData(((Field) member).getType());
diff --git a/openjpa.spec b/openjpa.spec
index 8b57051..71335f9 100644
--- a/openjpa.spec
+++ b/openjpa.spec
@@ -3,7 +3,7 @@
 
 Name:          openjpa
 Version:       2.2.2
-Release:       9%{?dist}
+Release:       10%{?dist}
 Summary:       Java Persistence 2.0 API
 # For a breakdown of the licensing, see NOTICE file
 License:       ASL 2.0 and CDDL
@@ -17,6 +17,11 @@ Patch1:        %{name}-2.2.0-remove-WASRegistryManagedRuntime.patch
 # https://issues.apache.org/jira/browse/OPENJPA-2386
 # https://issues.apache.org/jira/browse/OPENJPA-2441
 Patch2:        %{name}-2.2.2-java8.patch
+# No idea why this is needed, but compiler complains loudly without it:
+# [ERROR] .../AnnotationPersistenceXMLMetaDataParser.java:[164,64] cannot find symbol
+# [ERROR] symbol:   method booleanValue()
+# [ERROR] location: class java.lang.Object
+Patch3:        openjpa-2.2.2-java8-2.patch
 
 BuildRequires: apache-rat-plugin
 BuildRequires: buildnumber-maven-plugin
@@ -109,6 +114,7 @@ find . -name "*.jar" -delete
 %patch0 -p0
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %pom_remove_plugin :docbkx-maven-plugin
 %pom_remove_plugin :maven-checkstyle-plugin
@@ -282,6 +288,9 @@ install -p -m 644 %{name}-ant %{buildroot}%{_sysconfdir}/ant.d/%{name}
 %doc LICENSE NOTICE
 
 %changelog
+* Tue Feb 17 2015 Michal Srb <msrb at redhat.com> - 2.2.2-10
+- Fix FTBFS (Resolves: rhbz#1106654)
+
 * Wed Oct 08 2014 gil cattaneo <puntogil at libero.it> 2.2.2-9
 - build fix for Java 8