You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by de...@apache.org on 2019/01/17 19:06:55 UTC
[cxf] branch 3.1.x-fixes updated (15bbe69 -> 9667c05)
This is an automated email from the ASF dual-hosted git repository.
deki pushed a change to branch 3.1.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from 15bbe69 Fixing checkstyle issue
new 2d71c30 [CXF-7947] avoid NPE for classes in default package
new 9667c05 Recording .gitmergeinfo Changes
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitmergeinfo | 1 +
.../jaxb/src/main/java/org/apache/cxf/jaxb/Utils.java | 15 +++++++++------
2 files changed, 10 insertions(+), 6 deletions(-)
[cxf] 01/02: [CXF-7947] avoid NPE for classes in default package
Posted by de...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
deki pushed a commit to branch 3.1.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 2d71c30bc9f48d44966c4cafb0f55c64f631a965
Author: Dennis Kieselhorst <ma...@dekies.de>
AuthorDate: Thu Jan 17 16:41:26 2019 +0100
[CXF-7947] avoid NPE for classes in default package
(cherry picked from commit d9c0c2ffb468315c9e538736ac8e731782209640)
(cherry picked from commit d03dc931df389e7dbab72d1b1fb3ae5993f9c6f2)
---
.../jaxb/src/main/java/org/apache/cxf/jaxb/Utils.java | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/Utils.java b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/Utils.java
index 3899f50..830b89e 100644
--- a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/Utils.java
+++ b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/Utils.java
@@ -266,12 +266,15 @@ final class Utils {
adapter = f.getType().getAnnotation(XmlJavaTypeAdapter.class);
}
if (adapter == null) {
- XmlJavaTypeAdapters adapters = f.getDeclaringClass().getPackage().getAnnotation(XmlJavaTypeAdapters.class);
- if (adapters != null) {
- for (XmlJavaTypeAdapter candidate : adapters.value()) {
- if (candidate != null && candidate.type().equals(f.getType())) {
- adapter = candidate;
- break;
+ Package packageDeclaration = f.getDeclaringClass().getPackage();
+ if (packageDeclaration != null) {
+ XmlJavaTypeAdapters adapters = packageDeclaration.getAnnotation(XmlJavaTypeAdapters.class);
+ if (adapters != null) {
+ for (XmlJavaTypeAdapter candidate : adapters.value()) {
+ if (candidate != null && candidate.type().equals(f.getType())) {
+ adapter = candidate;
+ break;
+ }
}
}
}
[cxf] 02/02: Recording .gitmergeinfo Changes
Posted by de...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
deki pushed a commit to branch 3.1.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 9667c054e54df3d879399918a5e210ff5a0f3bc4
Author: Dennis Kieselhorst <ma...@dekies.de>
AuthorDate: Thu Jan 17 20:06:33 2019 +0100
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 325d189..293b672 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -971,6 +971,7 @@ B d06235af319225cb081374041d723be937189d8c
B d0dd55e901a83c1a4a014552a7da58f3899cd638
B d104261a0806818888aada81d2f98f5febdec8fa
B d111a1d71cf74588c28711b4db62178a736c8d84
+B d14c1740252b0170e77d81c7824b2da8646e88dc
B d151322220de948dea0539d5077354c988db80fb
B d226c07d4db15fa9244a2f011df801839a880f68
B d26570e26de80d0e0c6870ae5d959bfc8c0d19e4