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:26:55 UTC
[1/4] git commit: [CXF-6058] NPE guard in Header logging
Repository: cxf
Updated Branches:
refs/heads/master 5cf72fee4 -> 77a6da2ce
[CXF-6058] NPE guard in Header logging
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/cdc55cd4
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/cdc55cd4
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/cdc55cd4
Branch: refs/heads/master
Commit: cdc55cd46959d896a2e0e471a03a4733b1662394
Parents: 5cf72fe
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 13:57:05 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/cdc55cd4/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 46267ed..6c8dacd 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
@@ -277,7 +277,8 @@ public class Headers {
for (String header : headers.keySet()) {
List<?> headerList = headers.get(header);
for (Object value : headerList) {
- LOG.log(level, header + ": " + value.toString());
+ LOG.log(level, header + ": "
+ + (value == null ? "<null>" : value.toString()));
}
}
}
[3/4] 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/b57976f9
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b57976f9
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b57976f9
Branch: refs/heads/master
Commit: b57976f9d2e7436f4a632383e4466590e6c5eee3
Parents: 8687007
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:06:52 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/b57976f9/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 5472d9a..53a0d84 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
@@ -278,7 +278,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;
[2/4] 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/8687007e
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/8687007e
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/8687007e
Branch: refs/heads/master
Commit: 8687007e476a25b5e697afcde8db4d39aaf5ac15
Parents: cdc55cd
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:01:05 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/8687007e/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 44fbae6..cc8a0a1 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;
@@ -354,6 +355,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);
}
[4/4] 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/77a6da2c
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/77a6da2c
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/77a6da2c
Branch: refs/heads/master
Commit: 77a6da2ceabc8a19cf423a33430ea5995ea811e3
Parents: b57976f
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:11:39 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/77a6da2c/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();
}
}