You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2014/10/28 19:30:15 UTC
[1/5] git commit: [CXF-6058] NPE guard in Header logging
Repository: cxf
Updated Branches:
refs/heads/2.7.x-fixes 2d13ae6a2 -> 0503a5ae4
[CXF-6058] NPE guard in Header logging
Conflicts:
rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f56fbceb
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f56fbceb
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f56fbceb
Branch: refs/heads/2.7.x-fixes
Commit: f56fbcebe75167228da960cf92eec65d62f9b745
Parents: 2d13ae6
Author: Daniel Kulp <dk...@apache.org>
Authored: Tue Oct 28 13:57:05 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Tue Oct 28 14:29:55 2014 -0400
----------------------------------------------------------------------
.../http/src/main/java/org/apache/cxf/transport/http/Headers.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/f56fbceb/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 4ba6c52..814c082 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
@@ -254,7 +254,8 @@ public class Headers {
for (String header : headers.keySet()) {
List<String> headerList = headers.get(header);
for (String value : headerList) {
- LOG.log(level, header + ": " + value);
+ LOG.log(level, header + ": "
+ + (value == null ? "<null>" : value.toString()));
}
}
}
[4/5] git commit: [CXF-6030] Add an NPE guard and remove "null"
headers
Posted by dk...@apache.org.
[CXF-6030] Add an NPE guard and remove "null" headers
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/63d56507
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/63d56507
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/63d56507
Branch: refs/heads/2.7.x-fixes
Commit: 63d56507b0541cfa049a8dbaf91f2f66157c88ac
Parents: 9e171ed
Author: Daniel Kulp <dk...@apache.org>
Authored: Tue Oct 28 14:11:39 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Tue Oct 28 14:30:05 2014 -0400
----------------------------------------------------------------------
.../binding/soap/interceptor/SoapHeaderOutFilterInterceptor.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/63d56507/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapHeaderOutFilterInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapHeaderOutFilterInterceptor.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapHeaderOutFilterInterceptor.java
index 0a5a4e7..48e47a6 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapHeaderOutFilterInterceptor.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapHeaderOutFilterInterceptor.java
@@ -34,13 +34,12 @@ public class SoapHeaderOutFilterInterceptor extends AbstractSoapInterceptor {
}
public void handleMessage(SoapMessage message) throws Fault {
- // TODO Auto-generated method stub
Iterator<Header> iter = message.getHeaders().iterator();
while (iter.hasNext()) {
Header hdr = iter.next();
//Only remove inbound marked headers..
- if (hdr.getDirection() == Header.Direction.DIRECTION_IN) {
+ if (hdr == null || hdr.getDirection() == Header.Direction.DIRECTION_IN) {
iter.remove();
}
}
[2/5] git commit: [CXF-6041] Allow deactive/shutdown to proceed
without exception if the POA is already deactivated.
Posted by dk...@apache.org.
[CXF-6041] Allow deactive/shutdown to proceed without exception if the POA is already deactivated.
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/1e8804d6
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/1e8804d6
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/1e8804d6
Branch: refs/heads/2.7.x-fixes
Commit: 1e8804d62276d244cb8f48f05983d18283938a45
Parents: f56fbce
Author: Daniel Kulp <dk...@apache.org>
Authored: Tue Oct 28 14:00:05 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Tue Oct 28 14:29:58 2014 -0400
----------------------------------------------------------------------
.../main/java/org/apache/cxf/binding/corba/CorbaDestination.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/1e8804d6/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaDestination.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaDestination.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaDestination.java
index b94de2f..ed1deb9 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaDestination.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaDestination.java
@@ -52,6 +52,7 @@ import org.omg.PortableServer.LifespanPolicyValue;
import org.omg.PortableServer.POA;
import org.omg.PortableServer.POAHelper;
import org.omg.PortableServer.POAManager;
+import org.omg.PortableServer.POAPackage.ObjectNotActive;
import org.omg.PortableServer.RequestProcessingPolicyValue;
import org.omg.PortableServer.Servant;
import org.omg.PortableServer.ThreadPolicyValue;
@@ -356,6 +357,9 @@ public class CorbaDestination implements MultiplexDestination {
try {
bindingPOA.deactivate_object(objectId);
+ } catch (ObjectNotActive ona) {
+ LOG.info("Caught ObjectNotActive exception: " + ona
+ + " during deactivate_object() call on POA: " + bindingPOA);
} catch (Exception ex) {
throw new CorbaBindingException("Unable to deactivate CORBA servant", ex);
}
[5/5] git commit: Recording .gitmergeinfo Changes
Posted by dk...@apache.org.
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/0503a5ae
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/0503a5ae
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/0503a5ae
Branch: refs/heads/2.7.x-fixes
Commit: 0503a5ae4a3161925d460cdd78c4a0d79ed52506
Parents: 63d5650
Author: Daniel Kulp <dk...@apache.org>
Authored: Tue Oct 28 14:30:05 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Tue Oct 28 14:30:05 2014 -0400
----------------------------------------------------------------------
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/0503a5ae/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index dd27357..d7991fc 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -2196,6 +2196,7 @@ M fce8e753c2be355963a02bd585e4e74e9d8e5ebb
M fd44f59923e02e53b504ae5577063c2b45aa1bd9
M fdb5facca3515405944cdce74add228ed4f60811
M fdbf3b4d3bdc969b89ce6cec1dccf81339e0b006
+M fdc0d183dd0735e37eac91ba7af2957a66cfc767
M fdc889d48cb7dbf1f2ed9dc23969ffd2b43ffdbe
M fdfc50e48fb6fe7a75833e14ea43c53d266b1f40
M fe03e8e76db39520876a5b2e45b8d1096649f019
[3/5] git commit: [CXF-6068] Use XMLEventFactory.newInstance instead
of newFactory due to old stax-api jars being picked up.
Posted by dk...@apache.org.
[CXF-6068] Use XMLEventFactory.newInstance instead of newFactory due to old stax-api jars being picked up.
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/9e171ed1
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/9e171ed1
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/9e171ed1
Branch: refs/heads/2.7.x-fixes
Commit: 9e171ed15166baeaa24fa258bc87f3c48953a3ec
Parents: 1e8804d
Author: Daniel Kulp <dk...@apache.org>
Authored: Tue Oct 28 14:06:52 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Tue Oct 28 14:30:01 2014 -0400
----------------------------------------------------------------------
.../cxf/binding/soap/interceptor/ReadHeadersInterceptor.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/9e171ed1/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java
index 6d8d515..da79bf6 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java
@@ -272,7 +272,7 @@ public class ReadHeadersInterceptor extends AbstractSoapInterceptor {
* out while parsing the stream).
*/
private static class HeadersProcessor {
- private static final XMLEventFactory FACTORY = XMLEventFactory.newFactory();
+ private static final XMLEventFactory FACTORY = XMLEventFactory.newInstance();
private final QName soapVersionHeader;
private final List<XMLEvent> events = new ArrayList<XMLEvent>(8);
private StreamToDOMContext context;