Permalink
Browse files

Merged revisions 1463856 and 1464001 from the trunk. Those changes ar…

…e required to get profiling results to match with the trunk (we need the ability to turn off logging).

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/2013_RemoveJavolution@1467774 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
1 parent 5051c1b commit 84a1133c49d746a59fdfb383df3664f3b53e37ec @adrian-crum adrian-crum committed Apr 14, 2013
@@ -32,14 +32,19 @@ public BaseUnitTests(String name) {
}
public void testDebug() {
- Debug.set(Debug.VERBOSE, true);
- assertTrue(Debug.verboseOn());
-
- Debug.set(Debug.VERBOSE, false);
- assertFalse(Debug.verboseOn());
-
- Debug.set(Debug.INFO, true);
- assertTrue(Debug.infoOn());
+ boolean debugVerbose = Debug.get(Debug.VERBOSE);
+ boolean debugInfo = Debug.get(Debug.INFO);
+ try {
+ Debug.set(Debug.VERBOSE, true);
+ assertTrue(Debug.verboseOn());
+ Debug.set(Debug.VERBOSE, false);
+ assertFalse(Debug.verboseOn());
+ Debug.set(Debug.INFO, true);
+ assertTrue(Debug.infoOn());
+ } finally {
+ Debug.set(Debug.VERBOSE, debugVerbose);
+ Debug.set(Debug.INFO, debugInfo);
+ }
}
public void testFormatPrintableCreditCard_1() {
@@ -144,7 +144,7 @@ public boolean eval(String serviceName, DispatchContext dctx, Map<String, Object
Map<String, ? extends Object> envMap = UtilGenerics.checkMap(context.get(lhsMapName));
lhsValue = envMap.get(lhsValueName);
} else {
- Debug.logWarning("From Map (" + lhsMapName + ") not found in context, defaulting to null.", module);
+ Debug.logInfo("From Map (" + lhsMapName + ") not found in context, defaulting to null.", module);
}
} catch (ClassCastException e) {
throw new GenericServiceException("From Map field [" + lhsMapName + "] is not a Map.", e);
@@ -153,7 +153,7 @@ public boolean eval(String serviceName, DispatchContext dctx, Map<String, Object
if (context.containsKey(lhsValueName)) {
lhsValue = context.get(lhsValueName);
} else {
- Debug.logWarning("From Field (" + lhsValueName + ") is not found in context for " + serviceName + ", defaulting to null.", module);
+ Debug.logInfo("From Field (" + lhsValueName + ") is not found in context for " + serviceName + ", defaulting to null.", module);
}
}
@@ -165,7 +165,7 @@ public boolean eval(String serviceName, DispatchContext dctx, Map<String, Object
Map<String, ? extends Object> envMap = UtilGenerics.checkMap(context.get(rhsMapName));
rhsValue = envMap.get(rhsValueName);
} else {
- Debug.logWarning("To Map (" + rhsMapName + ") not found in context for " + serviceName + ", defaulting to null.", module);
+ Debug.logInfo("To Map (" + rhsMapName + ") not found in context for " + serviceName + ", defaulting to null.", module);
}
} catch (ClassCastException e) {
throw new GenericServiceException("To Map field [" + rhsMapName + "] is not a Map.", e);
@@ -185,7 +185,7 @@ public boolean eval(String serviceName, DispatchContext dctx, Map<String, Object
Boolean cond = ObjectType.doRealCompare(lhsValue, rhsValue, operator, compareType, format, messages, null, dctx.getClassLoader(), isConstant);
// if any messages were returned send them out
- if (messages.size() > 0) {
+ if (messages.size() > 0 && Debug.warningOn()) {
for (Object message: messages) {
Debug.logWarning(message.toString(), module);
}

0 comments on commit 84a1133

Please sign in to comment.