ws-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1069508 - in /webservices/wss4j/tags/1_6_0-alpha: ./ src/main/java/org/apache/ws/security/ src/main/java/org/apache/ws/security/message/token/ src/test/resources/
Date Thu, 10 Feb 2011 18:11:28 GMT
Author: coheigea
Date: Thu Feb 10 18:11:28 2011
New Revision: 1069508

URL: http://svn.apache.org/viewvc?rev=1069508&view=rev
Log:
JDK 1.5.x compilation fixes.

Modified:
    webservices/wss4j/tags/1_6_0-alpha/   (props changed)
    webservices/wss4j/tags/1_6_0-alpha/src/main/java/org/apache/ws/security/WSDocInfo.java
  (props changed)
    webservices/wss4j/tags/1_6_0-alpha/src/main/java/org/apache/ws/security/message/token/Reference.java
    webservices/wss4j/tags/1_6_0-alpha/src/main/java/org/apache/ws/security/message/token/SecurityTokenReference.java
    webservices/wss4j/tags/1_6_0-alpha/src/test/resources/log4j.properties   (props changed)

Propchange: webservices/wss4j/tags/1_6_0-alpha/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 10 18:11:28 2011
@@ -1 +1,2 @@
 /webservices/wss4j/branches/1_5_x-fixes:996180,996298,996339,997529,997535,1001926,1002116,1002347,1032939,1036805,1036890,1037678
+/webservices/wss4j/trunk:1069502

Propchange: webservices/wss4j/tags/1_6_0-alpha/src/main/java/org/apache/ws/security/WSDocInfo.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 10 18:11:28 2011
@@ -1 +1,2 @@
 /webservices/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/WSDocInfo.java:947604,996180,996298,996339,997529,997535,1001926,1002116,1002347,1032939,1036805,1036890,1037678
+/webservices/wss4j/trunk/src/main/java/org/apache/ws/security/WSDocInfo.java:1069502

Modified: webservices/wss4j/tags/1_6_0-alpha/src/main/java/org/apache/ws/security/message/token/Reference.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/tags/1_6_0-alpha/src/main/java/org/apache/ws/security/message/token/Reference.java?rev=1069508&r1=1069507&r2=1069508&view=diff
==============================================================================
--- webservices/wss4j/tags/1_6_0-alpha/src/main/java/org/apache/ws/security/message/token/Reference.java
(original)
+++ webservices/wss4j/tags/1_6_0-alpha/src/main/java/org/apache/ws/security/message/token/Reference.java
Thu Feb 10 18:11:28 2011
@@ -58,7 +58,7 @@ public class Reference {
 
         String uri = getURI();
         // Reference URI cannot be null or empty
-        if (uri == null || uri.isEmpty()) {
+        if (uri == null || "".equals(uri)) {
             throw new WSSecurityException(
                 WSSecurityException.INVALID_SECURITY, "badReferenceURI"
             );

Modified: webservices/wss4j/tags/1_6_0-alpha/src/main/java/org/apache/ws/security/message/token/SecurityTokenReference.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/tags/1_6_0-alpha/src/main/java/org/apache/ws/security/message/token/SecurityTokenReference.java?rev=1069508&r1=1069507&r2=1069508&view=diff
==============================================================================
--- webservices/wss4j/tags/1_6_0-alpha/src/main/java/org/apache/ws/security/message/token/SecurityTokenReference.java
(original)
+++ webservices/wss4j/tags/1_6_0-alpha/src/main/java/org/apache/ws/security/message/token/SecurityTokenReference.java
Thu Feb 10 18:11:28 2011
@@ -786,14 +786,14 @@ public class SecurityTokenReference {
             
             String valueType = getKeyIdentifierValueType();
             // ValueType cannot be null
-            if (valueType == null || valueType.isEmpty()) {
+            if (valueType == null || "".equals(valueType)) {
                 throw new WSSecurityException(
                     WSSecurityException.INVALID_SECURITY, "invalidValueType"
                 );
             }
             String encodingType = getFirstElement().getAttribute("EncodingType");
             // Encoding Type must be equal to Base64Binary if it's specified
-            if (encodingType != null && !encodingType.isEmpty() 
+            if (encodingType != null && !"".equals(encodingType)
                 && !BinarySecurity.BASE64_ENCODING.equals(encodingType)) {
                 throw new WSSecurityException(
                     WSSecurityException.INVALID_SECURITY, 
@@ -804,7 +804,7 @@ public class SecurityTokenReference {
             // Encoding type must be specified other than for a SAML Assertion
             if (!WSConstants.WSS_SAML_KI_VALUE_TYPE.equals(valueType) 
                 && !WSConstants.WSS_SAML2_KI_VALUE_TYPE.equals(valueType)
-                && (encodingType == null || encodingType.isEmpty())) {
+                && (encodingType == null || "".equals(encodingType))) {
                 throw new WSSecurityException(
                     WSSecurityException.INVALID_SECURITY, "noEncodingType"
                 );

Propchange: webservices/wss4j/tags/1_6_0-alpha/src/test/resources/log4j.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 10 18:11:28 2011
@@ -1 +1,2 @@
 /webservices/wss4j/branches/1_5_x-fixes/test/log4j.properties:1036805,1036890,1037678
+/webservices/wss4j/trunk/src/test/resources/log4j.properties:1069502



Mime
View raw message