This is an automated email from the git hooks/post-receive script. rockclimb-guest pushed a commit to branch master in repository eclipselink.
commit 96b608c306da1bb39c59a2c5351d9f2f1201f91e Author: Andrew Ross <[email protected]> Date: Fri Sep 27 23:27:48 2013 +0100 Fix casting errors --- debian/patches/explicitcast.patch | 68 +++++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 69 insertions(+) diff --git a/debian/patches/explicitcast.patch b/debian/patches/explicitcast.patch new file mode 100644 index 0000000..92be9b7 --- /dev/null +++ b/debian/patches/explicitcast.patch @@ -0,0 +1,68 @@ +--- a/org/eclipse/persistence/mappings/converters/ConverterClass.java ++++ b/org/eclipse/persistence/mappings/converters/ConverterClass.java +@@ -83,12 +83,12 @@ + if (PrivilegedAccessHelper.shouldUsePrivilegedAccess()) { + try { + attributeConverterClass = (Class) AccessController.doPrivileged(new PrivilegedClassForName(attributeConverterClassName, true, classLoader)); +- attributeConverter = AccessController.doPrivileged(new PrivilegedNewInstanceFromClass(attributeConverterClass)); ++ attributeConverter = (AttributeConverter)AccessController.doPrivileged(new PrivilegedNewInstanceFromClass(attributeConverterClass)); + } catch (PrivilegedActionException exception) { + throw ValidationException.classNotFoundWhileConvertingClassNames(attributeConverterClassName, exception.getException()); + } + } else { +- attributeConverterClass = PrivilegedAccessHelper.getClassForName(attributeConverterClassName, true, classLoader); ++ attributeConverterClass = (Class)PrivilegedAccessHelper.getClassForName(attributeConverterClassName, true, classLoader); + attributeConverter = (AttributeConverter) PrivilegedAccessHelper.newInstanceFromClass(attributeConverterClass); + } + } catch (ClassNotFoundException exception) { +--- a/org/eclipse/persistence/jpa/rs/PersistenceContext.java ++++ b/org/eclipse/persistence/jpa/rs/PersistenceContext.java +@@ -527,7 +527,7 @@ + } + Field[] fields = null; + if (PrivilegedAccessHelper.shouldUsePrivilegedAccess()) { +- fields = AccessController.doPrivileged(new PrivilegedGetDeclaredFields(clazz)); ++ fields = (Field[])AccessController.doPrivileged(new PrivilegedGetDeclaredFields(clazz)); + } else { + fields = PrivilegedAccessHelper.getDeclaredFields(clazz); + } +--- a/org/eclipse/persistence/internal/xr/QueryOperation.java ++++ b/org/eclipse/persistence/internal/xr/QueryOperation.java +@@ -615,8 +615,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()); +@@ -635,11 +635,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()); +--- a/org/eclipse/persistence/internal/jaxb/XMLJavaTypeConverter.java ++++ b/org/eclipse/persistence/internal/jaxb/XMLJavaTypeConverter.java +@@ -289,7 +289,7 @@ + } catch (IllegalAccessException e) { + Constructor ctor = null; + if (PrivilegedAccessHelper.shouldUsePrivilegedAccess()) { +- ctor = AccessController.doPrivileged(new PrivilegedGetConstructorFor(xmlAdapterClass, new Class[0], true)); ++ ctor = (Constructor)AccessController.doPrivileged(new PrivilegedGetConstructorFor(xmlAdapterClass, new Class[0], true)); + } else { + ctor = PrivilegedAccessHelper.getDeclaredConstructorFor(xmlAdapterClass, new Class[0], true); + } diff --git a/debian/patches/series b/debian/patches/series index 60768b8..d1fec79 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ disable_antlr3_embedded_copy.diff disable_asm_embedded_copy.diff charset.patch typeparameters.patch +explicitcast.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/eclipselink.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
