You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2014/02/21 17:08:02 UTC

[1/2] git commit: Recording .gitmergeinfo Changes

Repository: cxf
Updated Branches:
  refs/heads/2.7.x-fixes 7b8cf2deb -> f85058df0


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/340ba37e
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/340ba37e
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/340ba37e

Branch: refs/heads/2.7.x-fixes
Commit: 340ba37e205fe40fa50db93b6baef15f4ae68ed2
Parents: 7b8cf2d
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Fri Feb 21 15:40:00 2014 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Fri Feb 21 15:40:00 2014 +0000

----------------------------------------------------------------------
 .gitmergeinfo | 8 ++++++++
 1 file changed, 8 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/340ba37e/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 98cdf61..5493165 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -135,7 +135,9 @@ B 292bcb08bcb865a21929af20947beab032ff8889
 B 296ff8ec4e19396c6fee2e788968b843a47686ca
 B 299f085b723321401460e4fc8343563f795b6b73
 B 2a057461bc998a3c539434f7fe21adc5880e9d40
+B 2b3bb5e434082422a1631a434b3bd346c0ae766c
 B 2b573e9d69f9b4defac24f6295a7710baebf90b4
+B 2be064961812e7cf20474eedcdb2d5a5f903d5d7
 B 2ca6a5ec4332d494f71bbe9348ed96f876d28e42
 B 2ca813563898e4beb10da293668b740933ab683f
 B 2d2800ba52421c3e4a52dcf561b8f00b6f07f3d6
@@ -208,6 +210,7 @@ B 3f6e48515f61bfe66cdc489f6ec72cd3cb7aaf26
 B 3fa3231b13f06664b6aaf6b56e3de5738c89a574
 B 3fae604e2ab638a5fbce479078245c75675b5e72
 B 3fc5b8571d2454fc7a93e9a65a09b4c58968e74a
+B 405db9402430a6cf81601ae5aed9bfaa8830969e
 B 40a2c68f02fc3f33ab3ca897879c91970382048b
 B 40bc1bdf29cf4e8ea3fdaeb948671f1e019031f6
 B 40e0f9319b575932d5f07081eb1a6d1bf8318e32
@@ -303,6 +306,7 @@ B 5fddc354042fb460148470184fcb31ee1e173da2
 B 60668f71bf3ca9055ae93babc85e882613fdce14
 B 60862174e0c079db559de6a48dd35de6790d4ccb
 B 6096d78999d8fced697a29a02c62ddab98d25a3a
+B 60ced92f740f2f88dd75457e22e8775de88d1a09
 B 60e756d2dc7507716d8b8fa2bfd9b99fc3e2ce73
 B 60fec6d7fddaa8324fc9652c6b7cbc100fa31822
 B 61145ca9fe23be1c9a88570926308e30b276c5c1
@@ -315,6 +319,7 @@ B 6351c76dc86a2b2ddb4c6b8916e726ac8e084c6d
 B 63ee16dce3f659ea9dd0625be22f99152407a210
 B 63f6c6f64192c0a888299be79a4d6d3f6fcce968
 B 641eb0a55dc3c5a0f0ef642a3bc652f1f2dbe366
+B 642f2534d6dba97c2d1fb3fe274f900351b456c3
 B 646618cb1a65427846f28ff9ef432e3bb10b702e
 B 64a23c3044b21ce4acd722ceafae7997d0c3d841
 B 64f746bdd2f653d2a984edf29548e926a8417530
@@ -693,6 +698,7 @@ B d89b292f4939f419ceb097de02aa2861476cf2e1
 B d8dd9d657fdbedbb11be5a8a6a63ce13566d975a
 B d8e4ad366ca5fa36a0a89fac417b30a90c0e05ad
 B d94188fabcb2e6ca73bb3fcd685aa71cdcf5f5e3
+B d9a17baf7ce475b3784ae70c3b6aeede6c1799f6
 B da600d1605516c96c1fa52ab69cfa9355f983470
 B da877145dcfad9de38aa92e92f5b0d1d2c9a20b3
 B da8972f3d4e92b18f464009ec27228cef0069da5
@@ -905,6 +911,7 @@ M 2e0e4aa5c2314a3c1cf5b924ddf1a5a32f9a70a7
 M 2f250cf141de8abe1ddf5d053dff35038a453fa9
 M 2fd45aa13cf3470f5a4bdc78c2bf0621d3b23079
 M 307edfd819d881215047b36fb6f1f79bf0de8bd2
+M 3085f0fb44f1b7655bcc83019be20890aa9337a3
 M 30a2b16fb47589fe58ee25cb27590ddb0f58f6f9
 M 313b2dc34cf9ed5ddba6fef64853f6af143c3009
 M 31b6842880028b87b8bd43465fabc33f335ccaa7
@@ -1159,6 +1166,7 @@ M cf388678325e27f7f485339b92d01e0c484d4d07
 M cf83a6919d1c5cace0e1fa23cb0ce491b5ec44f7
 M cfb3f1801d853c631c61a074bc3d8b419de4e942
 M d15ad11d6201bf244d9c1a2ea6db333c6eb24e82
+M d33c0de10f41e860ef38793784f20172eb3df2c2
 M d4ccde7ae63eb53e9a93b116236cb84d405013c4
 M d5f77ca42144474a00aed49f55b03b2990531237
 M d6bde1b78fd21a40a1fcc65c3f23047f85678dcf

[2/2] git commit: Backmerging NPE fix

Posted by co...@apache.org.
Backmerging NPE fix


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f85058df
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f85058df
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f85058df

Branch: refs/heads/2.7.x-fixes
Commit: f85058df08665e652c5eed5854d5f355ff951311
Parents: 340ba37
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Fri Feb 21 16:07:47 2014 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Fri Feb 21 16:07:47 2014 +0000

----------------------------------------------------------------------
 .../SecureConversationTokenInterceptorProvider.java             | 5 +++++
 1 file changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/f85058df/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationTokenInterceptorProvider.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationTokenInterceptorProvider.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationTokenInterceptorProvider.java
index 32efb3d..9671a36 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationTokenInterceptorProvider.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationTokenInterceptorProvider.java
@@ -26,6 +26,7 @@ import java.util.logging.Logger;
 import org.apache.cxf.binding.soap.Soap11;
 import org.apache.cxf.binding.soap.SoapMessage;
 import org.apache.cxf.common.logging.LogUtils;
+import org.apache.cxf.interceptor.Fault;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.ws.policy.AbstractPolicyInterceptorProvider;
 import org.apache.cxf.ws.policy.AssertionInfoMap;
@@ -65,6 +66,10 @@ public class SecureConversationTokenInterceptorProvider extends AbstractPolicyIn
                             AssertionInfoMap aim,
                             SecureConversationToken itok,
                             boolean endorse) {
+        if (itok.getBootstrapPolicy() == null) {
+            throw new Fault("The SecureConversationToken does not define a BootstrapPolicy", LOG);
+        }
+
         client.setTrust(NegotiationUtils.getTrust10(aim));
         client.setTrust(NegotiationUtils.getTrust13(aim));
         Policy pol = itok.getBootstrapPolicy();