[eclipselink] fix some problems with missing explicit casts
gil
gil at fedoraproject.org
Sat Sep 28 07:50:38 UTC 2013
commit afda93d108fd5667cfa55c09f948a06b2ae319db
Author: gil <puntogil at libero.it>
Date: Sat Sep 28 09:50:16 2013 +0200
fix some problems with missing explicit casts
eclipselink-2.4.2-QueryOperation.patch | 29 +++++++++++++++++++++++++++++
eclipselink-2.4.2-build.xml | 13 ++-----------
eclipselink.spec | 8 +++++++-
3 files changed, 38 insertions(+), 12 deletions(-)
---
diff --git a/eclipselink-2.4.2-QueryOperation.patch b/eclipselink-2.4.2-QueryOperation.patch
new file mode 100644
index 0000000..0610ae5
--- /dev/null
+++ b/eclipselink-2.4.2-QueryOperation.patch
@@ -0,0 +1,29 @@
+--- org/eclipse/persistence/internal/xr/QueryOperation.java 2013-09-28 09:17:36.591871686 +0200
++++ org/eclipse/persistence/internal/xr/QueryOperation.java-gil 2013-09-28 09:17:51.464081462 +0200
+@@ -470,8 +470,8 @@
+ Class oracleSQLXML;
+ Method getStringMethod;
+ if (PrivilegedAccessHelper.shouldUsePrivilegedAccess()) {
+- oracleSQLXML = AccessController.doPrivileged(new PrivilegedClassForName(ORACLESQLXML_STR, true, this.getClass().getClassLoader()));
+- getStringMethod = AccessController.doPrivileged(new PrivilegedGetDeclaredMethod(oracleSQLXML, GETSTRING_METHOD, new Class[] {}));
++ oracleSQLXML = (Class)AccessController.doPrivileged(new PrivilegedClassForName(ORACLESQLXML_STR, true, this.getClass().getClassLoader()));
++ getStringMethod = (Method)AccessController.doPrivileged(new PrivilegedGetDeclaredMethod(oracleSQLXML, GETSTRING_METHOD, new Class[] {}));
+ fieldValue = (String) AccessController.doPrivileged(new PrivilegedMethodInvoker(getStringMethod, fieldValue, new Object[] {}));
+ } else {
+ oracleSQLXML = PrivilegedAccessHelper.getClassForName(ORACLESQLXML_STR, true, this.getClass().getClassLoader());
+@@ -490,11 +490,11 @@
+ Object xmlTypeFactory;
+ Method getStringMethod;
+ if (PrivilegedAccessHelper.shouldUsePrivilegedAccess()) {
+- oracleOPAQUE = AccessController.doPrivileged(new PrivilegedClassForName(ORACLEOPAQUE_STR, true, this.getClass().getClassLoader()));
+- xmlTypeFactoryClass = AccessController.doPrivileged(new PrivilegedClassForName(XMLTYPEFACTORY_STR, true, this.getClass().getClassLoader()));
+- xmlTypeFactoryConstructor = AccessController.doPrivileged(new PrivilegedGetConstructorFor(xmlTypeFactoryClass, new Class[0], true));
++ oracleOPAQUE = (Class)AccessController.doPrivileged(new PrivilegedClassForName(ORACLEOPAQUE_STR, true, this.getClass().getClassLoader()));
++ xmlTypeFactoryClass = (Class)AccessController.doPrivileged(new PrivilegedClassForName(XMLTYPEFACTORY_STR, true, this.getClass().getClassLoader()));
++ xmlTypeFactoryConstructor = (Constructor)AccessController.doPrivileged(new PrivilegedGetConstructorFor(xmlTypeFactoryClass, new Class[0], true));
+ xmlTypeFactory = AccessController.doPrivileged(new PrivilegedInvokeConstructor(xmlTypeFactoryConstructor, new Object[0]));
+- getStringMethod = AccessController.doPrivileged(new PrivilegedGetDeclaredMethod(xmlTypeFactoryClass, GETSTRING_METHOD, new Class[] {oracleOPAQUE}));
++ getStringMethod = (Method)AccessController.doPrivileged(new PrivilegedGetDeclaredMethod(xmlTypeFactoryClass, GETSTRING_METHOD, new Class[] {oracleOPAQUE}));
+ fieldValue = (String) AccessController.doPrivileged(new PrivilegedMethodInvoker(getStringMethod, fieldValue, new Object[] {}));
+ } else {
+ oracleOPAQUE = PrivilegedAccessHelper.getClassForName(ORACLEOPAQUE_STR, false, this.getClass().getClassLoader());
diff --git a/eclipselink-2.4.2-build.xml b/eclipselink-2.4.2-build.xml
index 865e260..0cc1025 100644
--- a/eclipselink-2.4.2-build.xml
+++ b/eclipselink-2.4.2-build.xml
@@ -96,19 +96,14 @@
<include name="commonj/**"/>
<!-- Oracle non free -->
<exclude name="org/eclipse/persistence/platform/database/oracle/ucp/**" />
- <exclude name="org/eclipse/persistence/tools/dbws/**" />
<exclude name="org/eclipse/persistence/internal/eis/adapters/aq/**" />
<exclude name="org/eclipse/persistence/eis/adapters/aq/**" />
<exclude name="org/eclipse/persistence/internal/platform/database/oracle/**" />
<exclude name="org/eclipse/persistence/platform/database/oracle/*.java" />
<exclude name="org/eclipse/persistence/platform/database/oracle/converters/**" />
<exclude name="org/eclipse/persistence/platform/database/oracle/dcn/**" />
- <exclude name="org/eclipse/persistence/tools/profiler/oracle//**" />
+ <exclude name="org/eclipse/persistence/tools/profiler/oracle/**" />
<exclude name="org/eclipse/persistence/platform/xml/xdk/**" />
- <exclude name="org/eclipse/persistence/dbws/**" />
- <exclude name="org/eclipse/persistence/internal/dbws/**" />
- <exclude name="org/eclipse/persistence/internal/xr/**" />
- <!--exclude name="org/eclipse/persistence/jpa/osgi/**" /-->
<!-- Embedded libraries -->
<exclude name="org/eclipse/persistence/internal/libraries/**" />
</javac>
@@ -273,18 +268,14 @@ org.eclipse.persistence.internal.libraries.asm.xml;version=${named.version},
<include name="org/eclipse/persistence/**"/>
<!-- Oracle non free -->
<exclude name="org/eclipse/persistence/platform/database/oracle/ucp/**" />
- <exclude name="org/eclipse/persistence/tools/dbws/**" />
<exclude name="org/eclipse/persistence/internal/eis/adapters/aq/**" />
<exclude name="org/eclipse/persistence/eis/adapters/aq/**" />
<exclude name="org/eclipse/persistence/internal/platform/database/oracle/**" />
<exclude name="org/eclipse/persistence/platform/database/oracle/*.java" />
<exclude name="org/eclipse/persistence/platform/database/oracle/converters/**" />
<exclude name="org/eclipse/persistence/platform/database/oracle/dcn/**" />
- <exclude name="org/eclipse/persistence/tools/profiler/oracle//**" />
+ <exclude name="org/eclipse/persistence/tools/profiler/oracle/**" />
<exclude name="org/eclipse/persistence/platform/xml/xdk/**" />
- <exclude name="org/eclipse/persistence/dbws/**" />
- <exclude name="org/eclipse/persistence/internal/dbws/**" />
- <exclude name="org/eclipse/persistence/internal/xr/**" />
<!-- Embedded libraries -->
<exclude name="org/eclipse/persistence/internal/libraries/**" />
</packageset>
diff --git a/eclipselink.spec b/eclipselink.spec
index 501e8a8..56c07e9 100644
--- a/eclipselink.spec
+++ b/eclipselink.spec
@@ -2,7 +2,7 @@
%global namedversion %{version}%{?reltag}
Name: eclipselink
Version: 2.4.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Eclipse Persistence Services Project
License: EPL and BSD
Url: http://www.eclipse.org/eclipselink/
@@ -15,6 +15,8 @@ Source5: http://repo1.maven.org/maven2/org/eclipse/persistence/org.eclipse
# use system libraries asm and antlr3
Patch0: %{name}-2.4.2-use-system-libraries.patch
+# thanks to Andrew Ross ubuntu[at]rossfamily.co.uk
+Patch1: %{name}-2.4.2-QueryOperation.patch
BuildRequires: java-devel
BuildRequires: jpackage-utils
@@ -79,6 +81,7 @@ sed -i "s|ctor = AccessController.doPrivileged|ctor = (Constructor) AccessContro
org/eclipse/persistence/internal/jaxb/XMLJavaTypeConverter.java
sed -i "s|fields = AccessController.doPrivileged|fields = (Field[]) AccessController.doPrivileged|" \
org/eclipse/persistence/jpa/rs/PersistenceContext.java
+%patch1 -p0
cp -p %{SOURCE1} build.properties
cp -p %{SOURCE2} build.xml
@@ -158,6 +161,9 @@ cp -pr target/api/* %{buildroot}%{_javadocdir}/%{name}
%doc license.html
%changelog
+* Sat Sep 28 2013 gil cattaneo <puntogil at libero.it> 2.4.2-2
+- fix some problems with missing explicit casts
+
* Tue Jul 16 2013 gil cattaneo <puntogil at libero.it> 2.4.2-1
- update to 2.4.2
More information about the scm-commits
mailing list