svn commit: r1435857 - /cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/STSClientFilter.java

[owulff]

Author: owulff
Date: Sun Jan 20 14:49:02 2013
New Revision: 1435857

URL: http://svn.apache.org/viewvc?rev=1435857&view=rev
Log:
Bug fix if contentType not configured

Modified:
    
cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/STSClientFilter.java

Modified: 
cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/STSClientFilter.java
URL: 
http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/STSClientFilter.java?rev=1435857&r1=1435856&r2=1435857&view=diff
==============================================================================
--- 
cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/STSClientFilter.java
 (original)
+++ 
cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/STSClientFilter.java
 Sun Jan 20 14:49:02 2013
@@ -181,7 +181,7 @@ public class STSClientFilter extends Abs
         }
         
         contentType = filterConfig.getInitParameter(PARAM_RSTR_CONTENT_TYPE);
-        if (PARAM_RSTR_CONTENT_TYPE == null) {
+        if (contentType == null) {
             throw new ServletException(
                                        "Parameter '" + PARAM_RSTR_CONTENT_TYPE 
+ "' not configured");
         }
@@ -233,7 +233,7 @@ public class STSClientFilter extends Abs
                                            
"http://docs.oasis-open.org/ws-sx/ws-trust/200512/";,
                                            stsWsdlEndpoint));
             String username = null;
-            if 
(authenticationType.equals(AuthenticationType.USERNAME_PASSWORD.toString())) {
+            if 
(AuthenticationType.USERNAME_PASSWORD.name().equals(authenticationType)) {
                 username = (String)context.get(AuthContext.AUTH_USERNAME);
                 String password = 
(String)context.get(AuthContext.AUTH_PASSWORD);
                 context.remove(AuthContext.AUTH_USERNAME);