svn commit: r1049459 - /servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixBinding.java

[ningjiang]

Author: ningjiang
Date: Wed Dec 15 08:46:27 2010
New Revision: 1049459

URL: http://svn.apache.org/viewvc?rev=1049459&view=rev
Log:
SMX4-708 Don't copy the null authentication header between the camelMessage and 
nmrMessage

Modified:
    
servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixBinding.java

Modified: 
servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixBinding.java
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixBinding.java?rev=1049459&r1=1049458&r2=1049459&view=diff
==============================================================================
--- 
servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixBinding.java
 (original)
+++ 
servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixBinding.java
 Wed Dec 15 08:46:27 2010
@@ -51,7 +51,9 @@ public class ServiceMixBinding {
             //addSecuritySubject(nmrMessage, camelMessage);
 
             // propagate the security subject
-            
nmrMessage.setSecuritySubject(camelMessage.getHeader(Exchange.AUTHENTICATION, 
Subject.class));
+            if (camelMessage.getHeader(Exchange.AUTHENTICATION, Subject.class) 
!= null) {
+                
nmrMessage.setSecuritySubject(camelMessage.getHeader(Exchange.AUTHENTICATION, 
Subject.class));
+            }
         }
     }
 
@@ -62,7 +64,9 @@ public class ServiceMixBinding {
         addCamelAttachments(nmrMessage, camelMessage);
 
         // copy the security subject
-        camelMessage.setHeader(Exchange.AUTHENTICATION, 
nmrMessage.getSecuritySubject());
+        if (nmrMessage.getSecuritySubject() != null) {
+            camelMessage.setHeader(Exchange.AUTHENTICATION, 
nmrMessage.getSecuritySubject());
+        }
     }
     
     public org.apache.servicemix.nmr.api.Exchange 
populateNmrExchangeFromCamelExchange(Exchange camelExchange, Channel client)  {