[1/2] cxf git commit: [CXF-7166] NullPointerException at org.apache.cxf.common.jaxb.JAXBUtils.createJAXBContextProxy
Repository: cxf Updated Branches: refs/heads/3.1.x-fixes ec33f44cc -> 922ec5d24 [CXF-7166] NullPointerException at org.apache.cxf.common.jaxb.JAXBUtils.createJAXBContextProxy Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e30c816f Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e30c816f Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e30c816f Branch: refs/heads/3.1.x-fixes Commit: e30c816fbbaa3c589062d2ae0202fc47ddd7d70b Parents: ec33f44 Author: Alessio SoldanoAuthored: Mon Dec 12 11:18:36 2016 +0100 Committer: Alessio Soldano Committed: Mon Dec 12 12:13:33 2016 +0100 -- .../java/org/apache/cxf/common/jaxb/JAXBContextCache.java| 8 ++-- 1 file changed, 2 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/e30c816f/core/src/main/java/org/apache/cxf/common/jaxb/JAXBContextCache.java -- diff --git a/core/src/main/java/org/apache/cxf/common/jaxb/JAXBContextCache.java b/core/src/main/java/org/apache/cxf/common/jaxb/JAXBContextCache.java index d6393d2..dcbe9fc 100644 --- a/core/src/main/java/org/apache/cxf/common/jaxb/JAXBContextCache.java +++ b/core/src/main/java/org/apache/cxf/common/jaxb/JAXBContextCache.java @@ -69,11 +69,6 @@ public final class JAXBContextCache { this.classes = classes; ccas = new WeakReference(i); } -private CachedContextAndSchemas(CachedContextAndSchemasInternal i) { -this.context = i.getContext(); -this.classes = i.getClasses(); -ccas = new WeakReference(i); -} public JAXBContext getContext() { return context; } @@ -237,7 +232,8 @@ public final class JAXBContextCache { JAXBCONTEXT_CACHE.remove(cachedContextAndSchemasInternal.getClasses()); cachedContextAndSchemasInternal = null; } else { -return new CachedContextAndSchemas(cachedContextAndSchemasInternal); +return new CachedContextAndSchemas(context, cachedContextAndSchemasInternal.getClasses(), +cachedContextAndSchemasInternal); } } }
[2/2] cxf git commit: Recording .gitmergeinfo Changes
Recording .gitmergeinfo Changes Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/922ec5d2 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/922ec5d2 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/922ec5d2 Branch: refs/heads/3.1.x-fixes Commit: 922ec5d244f632c57ac5c3e6a3322c9d1a0abde1 Parents: e30c816 Author: Alessio SoldanoAuthored: Mon Dec 12 12:14:32 2016 +0100 Committer: Alessio Soldano Committed: Mon Dec 12 12:14:32 2016 +0100 -- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/922ec5d2/.gitmergeinfo -- diff --git a/.gitmergeinfo b/.gitmergeinfo index c405019..44822d4 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -243,6 +243,7 @@ M a9fe8470ce9522f08c298e58f76636c48d57b7a4 M abcc137cb9b27e0da0b4270a18ac2a32df1e9990 M b2b6f0137cd9f1bafff5d487e8383453692a2ff0 M b2e5fb6583d64deeb8a42d2eeb6935c5f33dc0c6 +M b49075882641fcebbbdf1ed8d84247fcf80aa558 M b624c034c5682b54b9faf3d3e90eb0c23cde1a5b M c01c68ddda10ec6db492b86d818498bec0bf4228 M c212240f696e3387df19bbcf22d1851aff320078
cxf git commit: [CXF-7174] Avoid NPE when content-type not set in http request, patch from Andy McCright applied, This closes #213
Repository: cxf Updated Branches: refs/heads/3.0.x-fixes 1a1499e91 -> 8921296ff [CXF-7174] Avoid NPE when content-type not set in http request, patch from Andy McCright applied, This closes #213 Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/8921296f Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/8921296f Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/8921296f Branch: refs/heads/3.0.x-fixes Commit: 8921296ff8e6f3694460e0b3153cf3625e2357a7 Parents: 1a1499e Author: Sergey BeryozkinAuthored: Mon Dec 12 10:03:39 2016 + Committer: Sergey Beryozkin Committed: Mon Dec 12 10:34:31 2016 + -- .../org/apache/cxf/transport/http/Headers.java | 2 +- .../apache/cxf/transport/http/HeadersTest.java | 60 +++- 2 files changed, 48 insertions(+), 14 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/8921296f/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java -- diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java index dee9d61..5c8fa4d 100644 --- a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java +++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java @@ -359,7 +359,7 @@ public class Headers { public String determineContentType() { String ct = null; List ctList = CastUtils.cast(headers.get(Message.CONTENT_TYPE)); -if (ctList != null && ctList.size() == 1) { +if (ctList != null && ctList.size() == 1 && ctList.get(0) != null) { ct = ctList.get(0).toString(); } else { ct = (String)message.get(Message.CONTENT_TYPE); http://git-wip-us.apache.org/repos/asf/cxf/blob/8921296f/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HeadersTest.java -- diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HeadersTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HeadersTest.java index e20a5e0..e26e5ff 100755 --- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HeadersTest.java +++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HeadersTest.java @@ -36,29 +36,17 @@ import org.apache.cxf.message.MessageImpl; import org.easymock.EasyMock; import org.easymock.IMocksControl; -import org.junit.AfterClass; import org.junit.Assert; -import org.junit.BeforeClass; import org.junit.Test; /** * */ public class HeadersTest extends Assert { -private static IMocksControl control; - -@BeforeClass -public static void setUpClass() { -control = EasyMock.createNiceControl(); -} - -@AfterClass -public static void tearDownClass() { -control.verify(); -} @Test public void setHeadersTest() throws Exception { +IMocksControl control = EasyMock.createNiceControl(); String[] headerNames = {"Content-Type", "authorization", "soapAction"}; String[] headerValues = {"text/xml", "Basic Zm9vOmJhcg==", "foo"}; Map inmap = new HashMap (); @@ -102,6 +90,7 @@ public class HeadersTest extends Assert { assertEquals("unexpected header", protocolHeaders.get("SOAPACTION").get(0), headerValues[2]); assertEquals("unexpected header", protocolHeaders.get("soapAction").get(0), headerValues[2]); +control.verify(); } @Test @@ -174,4 +163,49 @@ public class HeadersTest extends Assert { Headers.logProtocolHeaders(logger, Level.INFO, headerMap, false); } + +@Test +public void nullContentTypeTest() { +IMocksControl control = EasyMock.createNiceControl(); + +Message message = new MessageImpl(); + +// first check - content-type==null in message, nothing specified in request +// expect that determineContentType will return the default value of text/xml +message.put(Message.CONTENT_TYPE, null); +Headers headers = new Headers(message); +assertEquals("Unexpected content-type determined - expected text/xml", "text/xml", + headers.determineContentType()); + +// second check - null specified in request, valid content-type specified in message +// expect that determineContentType returns the content-type specified in the message +HttpServletRequest req = control.createMock(HttpServletRequest.class); + EasyMock.expect(req.getHeaderNames()).andReturn(Collections.emptyEnumeration()); +
cxf git commit: Fixing 3.1.x build failure
Repository: cxf Updated Branches: refs/heads/3.1.x-fixes 718892116 -> ec33f44cc Fixing 3.1.x build failure Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/ec33f44c Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ec33f44c Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ec33f44c Branch: refs/heads/3.1.x-fixes Commit: ec33f44cc7d7846162b164c7701d9c07fc1ae121 Parents: 7188921 Author: Sergey BeryozkinAuthored: Mon Dec 12 10:30:04 2016 + Committer: Sergey Beryozkin Committed: Mon Dec 12 10:30:04 2016 + -- .../src/test/java/org/apache/cxf/transport/http/HeadersTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/ec33f44c/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HeadersTest.java -- diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HeadersTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HeadersTest.java index bcb4228..480521c 100755 --- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HeadersTest.java +++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HeadersTest.java @@ -179,7 +179,7 @@ public class HeadersTest extends Assert { // second check - null specified in request, valid content-type specified in message // expect that determineContentType returns the content-type specified in the message HttpServletRequest req = control.createMock(HttpServletRequest.class); - EasyMock.expect(req.getHeaderNames()).andReturn(Collections.emptyEnumeration()); + EasyMock.expect(req.getHeaderNames()).andReturn(Collections.emptyEnumeration()); EasyMock.expect(req.getContentType()).andReturn(null).anyTimes(); control.replay(); message = new MessageImpl(); @@ -195,7 +195,7 @@ public class HeadersTest extends Assert { // expect that determineContentType returns the default value of text/xml control = EasyMock.createNiceControl(); req = control.createMock(HttpServletRequest.class); - EasyMock.expect(req.getHeaderNames()).andReturn(Collections.emptyEnumeration()); + EasyMock.expect(req.getHeaderNames()).andReturn(Collections.emptyEnumeration()); EasyMock.expect(req.getContentType()).andReturn(null).anyTimes(); control.replay(); message = new MessageImpl();
cxf git commit: [CXF-7166] NullPointerException at org.apache.cxf.common.jaxb.JAXBUtils.createJAXBContextProxy
Repository: cxf Updated Branches: refs/heads/master de9c7ecd7 -> b49075882 [CXF-7166] NullPointerException at org.apache.cxf.common.jaxb.JAXBUtils.createJAXBContextProxy Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/b4907588 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b4907588 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b4907588 Branch: refs/heads/master Commit: b49075882641fcebbbdf1ed8d84247fcf80aa558 Parents: de9c7ec Author: Alessio SoldanoAuthored: Mon Dec 12 11:18:36 2016 +0100 Committer: Alessio Soldano Committed: Mon Dec 12 11:23:02 2016 +0100 -- .../java/org/apache/cxf/common/jaxb/JAXBContextCache.java| 8 ++-- 1 file changed, 2 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/b4907588/core/src/main/java/org/apache/cxf/common/jaxb/JAXBContextCache.java -- diff --git a/core/src/main/java/org/apache/cxf/common/jaxb/JAXBContextCache.java b/core/src/main/java/org/apache/cxf/common/jaxb/JAXBContextCache.java index d6393d2..dcbe9fc 100644 --- a/core/src/main/java/org/apache/cxf/common/jaxb/JAXBContextCache.java +++ b/core/src/main/java/org/apache/cxf/common/jaxb/JAXBContextCache.java @@ -69,11 +69,6 @@ public final class JAXBContextCache { this.classes = classes; ccas = new WeakReference(i); } -private CachedContextAndSchemas(CachedContextAndSchemasInternal i) { -this.context = i.getContext(); -this.classes = i.getClasses(); -ccas = new WeakReference(i); -} public JAXBContext getContext() { return context; } @@ -237,7 +232,8 @@ public final class JAXBContextCache { JAXBCONTEXT_CACHE.remove(cachedContextAndSchemasInternal.getClasses()); cachedContextAndSchemasInternal = null; } else { -return new CachedContextAndSchemas(cachedContextAndSchemasInternal); +return new CachedContextAndSchemas(context, cachedContextAndSchemasInternal.getClasses(), +cachedContextAndSchemasInternal); } } }
cxf git commit: [CXF-7174] Avoid NPE when content-type not set in http request, patch from Andy McCright applied, This closes #213
Repository: cxf Updated Branches: refs/heads/3.1.x-fixes f32dcab58 -> 718892116 [CXF-7174] Avoid NPE when content-type not set in http request, patch from Andy McCright applied, This closes #213 Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/71889211 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/71889211 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/71889211 Branch: refs/heads/3.1.x-fixes Commit: 7188921166444e861adf9b133708cef7c01d4b49 Parents: f32dcab Author: Sergey BeryozkinAuthored: Mon Dec 12 10:03:39 2016 + Committer: Sergey Beryozkin Committed: Mon Dec 12 10:04:43 2016 + -- .../org/apache/cxf/transport/http/Headers.java | 2 +- .../apache/cxf/transport/http/HeadersTest.java | 60 +++- 2 files changed, 48 insertions(+), 14 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/71889211/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java -- diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java index 3d58112..8aecbd3 100644 --- a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java +++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java @@ -373,7 +373,7 @@ public class Headers { public String determineContentType() { String ct = null; List ctList = CastUtils.cast(headers.get(Message.CONTENT_TYPE)); -if (ctList != null && ctList.size() == 1) { +if (ctList != null && ctList.size() == 1 && ctList.get(0) != null) { ct = ctList.get(0).toString(); } else { ct = (String)message.get(Message.CONTENT_TYPE); http://git-wip-us.apache.org/repos/asf/cxf/blob/71889211/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HeadersTest.java -- diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HeadersTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HeadersTest.java index bf5cf84..bcb4228 100755 --- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HeadersTest.java +++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HeadersTest.java @@ -36,29 +36,17 @@ import org.apache.cxf.message.MessageImpl; import org.easymock.EasyMock; import org.easymock.IMocksControl; -import org.junit.AfterClass; import org.junit.Assert; -import org.junit.BeforeClass; import org.junit.Test; /** * */ public class HeadersTest extends Assert { -private static IMocksControl control; - -@BeforeClass -public static void setUpClass() { -control = EasyMock.createNiceControl(); -} - -@AfterClass -public static void tearDown() { -control.verify(); -} @Test public void setHeadersTest() throws Exception { +IMocksControl control = EasyMock.createNiceControl(); String[] headerNames = {"Content-Type", "authorization", "soapAction"}; String[] headerValues = {"text/xml", "Basic Zm9vOmJhcg==", "foo"}; Map inmap = new HashMap (); @@ -102,6 +90,7 @@ public class HeadersTest extends Assert { assertEquals("unexpected header", protocolHeaders.get("SOAPACTION").get(0), headerValues[2]); assertEquals("unexpected header", protocolHeaders.get("soapAction").get(0), headerValues[2]); +control.verify(); } @Test @@ -173,4 +162,49 @@ public class HeadersTest extends Assert { Headers.logProtocolHeaders(logger, Level.INFO, headerMap, false); } + +@Test +public void nullContentTypeTest() { +IMocksControl control = EasyMock.createNiceControl(); + +Message message = new MessageImpl(); + +// first check - content-type==null in message, nothing specified in request +// expect that determineContentType will return the default value of text/xml +message.put(Message.CONTENT_TYPE, null); +Headers headers = new Headers(message); +assertEquals("Unexpected content-type determined - expected text/xml", "text/xml", + headers.determineContentType()); + +// second check - null specified in request, valid content-type specified in message +// expect that determineContentType returns the content-type specified in the message +HttpServletRequest req = control.createMock(HttpServletRequest.class); + EasyMock.expect(req.getHeaderNames()).andReturn(Collections.emptyEnumeration()); +
cxf git commit: [CXF-7174] Avoid NPE when content-type not set in http request, patch from Andy McCright applied, This closes #213
Repository: cxf Updated Branches: refs/heads/master 45bc2219b -> de9c7ecd7 [CXF-7174] Avoid NPE when content-type not set in http request, patch from Andy McCright applied, This closes #213 Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/de9c7ecd Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/de9c7ecd Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/de9c7ecd Branch: refs/heads/master Commit: de9c7ecd7a4d205aa26d893889235468797e87bb Parents: 45bc221 Author: Sergey BeryozkinAuthored: Mon Dec 12 10:03:39 2016 + Committer: Sergey Beryozkin Committed: Mon Dec 12 10:03:39 2016 + -- .../org/apache/cxf/transport/http/Headers.java | 2 +- .../apache/cxf/transport/http/HeadersTest.java | 60 +++- 2 files changed, 48 insertions(+), 14 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/de9c7ecd/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java -- diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java index 3d58112..8aecbd3 100644 --- a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java +++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java @@ -373,7 +373,7 @@ public class Headers { public String determineContentType() { String ct = null; List ctList = CastUtils.cast(headers.get(Message.CONTENT_TYPE)); -if (ctList != null && ctList.size() == 1) { +if (ctList != null && ctList.size() == 1 && ctList.get(0) != null) { ct = ctList.get(0).toString(); } else { ct = (String)message.get(Message.CONTENT_TYPE); http://git-wip-us.apache.org/repos/asf/cxf/blob/de9c7ecd/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HeadersTest.java -- diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HeadersTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HeadersTest.java index bf5cf84..bcb4228 100755 --- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HeadersTest.java +++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HeadersTest.java @@ -36,29 +36,17 @@ import org.apache.cxf.message.MessageImpl; import org.easymock.EasyMock; import org.easymock.IMocksControl; -import org.junit.AfterClass; import org.junit.Assert; -import org.junit.BeforeClass; import org.junit.Test; /** * */ public class HeadersTest extends Assert { -private static IMocksControl control; - -@BeforeClass -public static void setUpClass() { -control = EasyMock.createNiceControl(); -} - -@AfterClass -public static void tearDown() { -control.verify(); -} @Test public void setHeadersTest() throws Exception { +IMocksControl control = EasyMock.createNiceControl(); String[] headerNames = {"Content-Type", "authorization", "soapAction"}; String[] headerValues = {"text/xml", "Basic Zm9vOmJhcg==", "foo"}; Map inmap = new HashMap (); @@ -102,6 +90,7 @@ public class HeadersTest extends Assert { assertEquals("unexpected header", protocolHeaders.get("SOAPACTION").get(0), headerValues[2]); assertEquals("unexpected header", protocolHeaders.get("soapAction").get(0), headerValues[2]); +control.verify(); } @Test @@ -173,4 +162,49 @@ public class HeadersTest extends Assert { Headers.logProtocolHeaders(logger, Level.INFO, headerMap, false); } + +@Test +public void nullContentTypeTest() { +IMocksControl control = EasyMock.createNiceControl(); + +Message message = new MessageImpl(); + +// first check - content-type==null in message, nothing specified in request +// expect that determineContentType will return the default value of text/xml +message.put(Message.CONTENT_TYPE, null); +Headers headers = new Headers(message); +assertEquals("Unexpected content-type determined - expected text/xml", "text/xml", + headers.determineContentType()); + +// second check - null specified in request, valid content-type specified in message +// expect that determineContentType returns the content-type specified in the message +HttpServletRequest req = control.createMock(HttpServletRequest.class); + EasyMock.expect(req.getHeaderNames()).andReturn(Collections.emptyEnumeration()); +