perfsonar development work

Author: nordunet.behrmann
Date: 2012-10-05 10:22:54 +0100 (Fri, 05 Oct 2012)
New Revision: 6017

Modified:
   
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/mapping/ExpressionMapping.java
Log:
perfsonar_base: Fix bug in dead code

getMapping ignored the return value of String.replaceAll. The code was not
used (at least not in SQL MA).

Issue: PSSERVICES-597

Modified: 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/mapping/ExpressionMapping.java
===================================================================
--- 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/mapping/ExpressionMapping.java
   2012-10-05 09:22:53 UTC (rev 6016)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/mapping/ExpressionMapping.java
   2012-10-05 09:22:54 UTC (rev 6017)
@@ -133,9 +133,9 @@
         String replacement)
     {
         String out = mappings.get(mappingName);
-        if (pattern != null & out != null && replacement != null) {
+        if (pattern != null && out != null && replacement != null) {
             String regexp = "\\%" + pattern + "\\%";
-            out.replaceAll(regexp, replacement);
+            out = out.replaceAll(regexp, replacement);
         }
         return out;