Add a little bit more structure to message header storage to generally avoid having to loop across headers to find the right one.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@954414 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 6 insertions, 19 deletions

diff --git a/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/SecurityUtil.java b/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/SecurityUtil.java
index d2e0180095..50349cdf88 100644
--- a/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/SecurityUtil.java
+++ b/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/SecurityUtil.java
@@ -33,20 +33,16 @@ import org.apache.tuscany.sca.invocation.Message;
  */
 public class SecurityUtil {
     
+    public static String SubjectString = "Subject";
+    public static String PrincipalString = "Principal";
+    
     public static Subject getSubject(Message msg){
         
-        Subject subject = null;
-        
-        for (Object header : msg.getHeaders()){
-            if (header instanceof Subject){
-                subject  = (Subject)header;
-                break;
-            }
-        }
+        Subject subject = (Subject)msg.getHeaders().get(SubjectString);
         
         if (subject == null){
             subject = new Subject(); 
-            msg.getHeaders().add(subject); 
+            msg.getHeaders().put(SubjectString, subject); 
         }
         
         return subject;
@@ -64,15 +60,6 @@ public class SecurityUtil {
     
     public static Principal getPrincipal(Message msg){
         
-        Principal principal = null;
-        
-        for (Object header : msg.getHeaders()){
-            if (header instanceof Principal){
-                principal  = (Principal)header;
-                break;
-            }
-        }
-        
-        return principal;
+        return (Principal)msg.getHeaders().get(PrincipalString);
     }    
 }