summaryrefslogtreecommitdiffstats
path: root/recipes-core/icedtea/openjdk-7-03b147
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2016-04-11 14:39:46 +0800
committerOtavio Salvador <otavio@ossystems.com.br>2016-04-11 08:07:26 -0300
commit1d125bfa18f7363bf9c9887434c441acbde10862 (patch)
tree1941c6ed93523c85d9f16129390005d41fc76b8d /recipes-core/icedtea/openjdk-7-03b147
parentefc3daa7526a5ae5aad24a0f777d2274aab3d5c3 (diff)
downloadmeta-java-1d125bfa18f7363bf9c9887434c441acbde10862.tar.gz
icedtea7-native: backport patch of jaxb to fix NullPointerException
Backport patch of jaxb from https://java.net/projects/jaxb/sources/v2/revision/1864898 to fix NullPointerException. See https://java.net/jira/browse/JAXB-860 as well. Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'recipes-core/icedtea/openjdk-7-03b147')
-rw-r--r--recipes-core/icedtea/openjdk-7-03b147/jaxws_fix_NullPointerException.patch21
1 files changed, 21 insertions, 0 deletions
diff --git a/recipes-core/icedtea/openjdk-7-03b147/jaxws_fix_NullPointerException.patch b/recipes-core/icedtea/openjdk-7-03b147/jaxws_fix_NullPointerException.patch
new file mode 100644
index 0000000..ba47036
--- /dev/null
+++ b/recipes-core/icedtea/openjdk-7-03b147/jaxws_fix_NullPointerException.patch
@@ -0,0 +1,21 @@
1Upstream-Status: Backport [https://java.net/projects/jaxb/sources/v2/revision/1864898]
2
3Backport patch of jaxb to fix NullPointerException issue.
4
5Signed-off-by: Kai Kang <kai.kang@windriver.com>
6---
7diff --git a/openjdk/jaxws/sources/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/ClassBeanInfoImpl.java b/openjdk/jaxws/sources/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/ClassBeanInfoImpl.java
8index dc88d45..cc4f6e9 100644
9--- a/openjdk/jaxws/sources/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/ClassBeanInfoImpl.java
10+++ b/openjdk/jaxws/sources/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/ClassBeanInfoImpl.java
11@@ -187,7 +187,9 @@ public final class ClassBeanInfoImpl<BeanT> extends JaxBeanInfo<BeanT> implement
12 private void checkOverrideProperties(Property p) {
13 ClassBeanInfoImpl bi = this;
14 while ((bi = bi.superClazz) != null) {
15- for (Property superProperty : bi.properties) {
16+ Property[] props = bi.properties;
17+ if (props == null) break;
18+ for (Property superProperty : props) {
19 if (superProperty == null) break;
20 String spName = superProperty.getFieldName();
21 if ((spName != null) && (spName.equals(p.getFieldName()))) {