git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1139 d688527b-c9ab-4aba-bd8d-4036d912da1d

2 files changed, 10 insertions, 13 deletions

diff --git a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/DataObjectFactory.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/DataObjectFactory.java
index fab8a6dd7..566784796 100644
--- a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/DataObjectFactory.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/DataObjectFactory.java
@@ -210,19 +210,21 @@ public class DataObjectFactory {
 
     // For logging in Debug-Mode: Mask baseid with xxx
     String logString = new String(contentBytes);
+    // TODO use RegExp
     String startS = "<pr:Identification><pr:Value>";
     String endS = "</pr:Value><pr:Type>urn:publicid:gv.at:baseid</pr:Type>";
-    String logWithMaskedBaseid;
+    String logWithMaskedBaseid = logString;
     int start = logString.indexOf(startS);
     if (start > -1) {
-       int end = logString.indexOf(endS);    
-       logWithMaskedBaseid = logString.substring(0, start);
-       logWithMaskedBaseid += startS;
-       logWithMaskedBaseid += "xxxxxxxxxxxxxxxxxxxxxxxx";
-       logWithMaskedBaseid += logString.substring(end, logString.length());
+       int end = logString.indexOf(endS);
+       if (end > -1) {
+          logWithMaskedBaseid = logString.substring(0, start);
+          logWithMaskedBaseid += startS;
+          logWithMaskedBaseid += "xxxxxxxxxxxxxxxxxxxxxxxx";
+          logWithMaskedBaseid += logString.substring(end, logString.length());
+       }
     }
-    else
-       logWithMaskedBaseid = logString;
+    
     // try to parse validating
     Logger.trace(">>> parsing the following content: \n" + logWithMaskedBaseid);
     try {
diff --git a/spss/server/serverws/.project b/spss/server/serverws/.project
index a115e2dea..c7e484cc8 100644
--- a/spss/server/serverws/.project
+++ b/spss/server/serverws/.project
@@ -8,11 +8,6 @@
 	</projects>

 	<buildSpec>

 		<buildCommand>

-			<name>org.eclipse.wst.jsdt.core.javascriptValidator</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

 			<name>org.eclipse.jdt.core.javabuilder</name>

 			<arguments>

 			</arguments>