You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by co...@apache.org on 2014/01/23 17:40:27 UTC
svn commit: r1560734 - in /webservices/wss4j/trunk:
ws-security-dom/src/main/java/org/apache/wss4j/dom/util/WSSecurityUtil.java
ws-security-stax/src/main/java/org/apache/wss4j/stax/ConfigurationConverter.java
Author: coheigea
Date: Thu Jan 23 16:40:27 2014
New Revision: 1560734
URL: http://svn.apache.org/r1560734
Log:
Refining last commit
Modified:
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/WSSecurityUtil.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ConfigurationConverter.java
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/WSSecurityUtil.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/WSSecurityUtil.java?rev=1560734&r1=1560733&r2=1560734&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/WSSecurityUtil.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/WSSecurityUtil.java Thu Jan 23 16:40:27 2014
@@ -907,10 +907,15 @@ public final class WSSecurityUtil {
public static List<Integer> decodeAction(String action) throws WSSecurityException {
List<Integer> actions = new ArrayList<Integer>();
- if (action == null || "".equals(action)) {
+ String actionToParse = action;
+ if (actionToParse == null) {
return actions;
}
- String single[] = action.split(" ");
+ actionToParse = actionToParse.trim();
+ if ("".equals(actionToParse)) {
+ return actions;
+ }
+ String single[] = actionToParse.split("\\s");
for (int i = 0; i < single.length; i++) {
if (single[i].equals(WSHandlerConstants.NO_SECURITY)) {
return actions;
Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ConfigurationConverter.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ConfigurationConverter.java?rev=1560734&r1=1560733&r2=1560734&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ConfigurationConverter.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ConfigurationConverter.java Thu Jan 23 16:40:27 2014
@@ -81,11 +81,15 @@ public final class ConfigurationConverte
) {
String action = getString(ConfigurationConstants.ACTION, config);
- if (action == null || "".equals(action)) {
+ String actionToParse = action;
+ if (actionToParse == null) {
return;
}
-
- String single[] = action.split(" ");
+ actionToParse = actionToParse.trim();
+ if ("".equals(actionToParse)) {
+ return;
+ }
+ String single[] = actionToParse.split("\\s");
List<Action> actions = new ArrayList<Action>();
for (int i = 0; i < single.length; i++) {
if (single[i].equals(ConfigurationConstants.USERNAME_TOKEN)) {