You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by bu...@apache.org on 2015/10/05 15:01:24 UTC

svn commit: r1706832 - /uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jp/UimaASProcessContainer.java

Author: burn
Date: Mon Oct  5 13:01:24 2015
New Revision: 1706832

URL: http://svn.apache.org/viewvc?rev=1706832&view=rev
Log:
UIMA-4630 Performance metric fix will be in some UIMA-AS after 2.6.1

Modified:
    uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jp/UimaASProcessContainer.java

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jp/UimaASProcessContainer.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jp/UimaASProcessContainer.java?rev=1706832&r1=1706831&r2=1706832&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jp/UimaASProcessContainer.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jp/UimaASProcessContainer.java Mon Oct  5 13:01:24 2015
@@ -103,11 +103,14 @@ public class UimaASProcessContainer  ext
 		if ( "uima-as".equals(jobType)) {
 			System.out.println("UIMA-AS Version:"+UimaAsVersion.getFullVersionString());
         } 
-		// enable performance breakdown reporting for uima AS version > 2.6.0
-		if ( UimaAsVersion.getMajorVersion() >=2 && UimaAsVersion.getMinorVersion() >= 6 && UimaAsVersion.getBuildRevision() > 0) {
-     	    enablePerformanceBreakdownReporting = true;
-		}
-		
+		// enable performance breakdown reporting when support is added in the next UIMA AS release after 2.6.0
+		// (assumes the fix will be after the current 2.6.1-SNAPSHOT level)
+        if (UimaAsVersion.getMajorVersion() > 2 || (UimaAsVersion.getMajorVersion() == 2 &&
+                (UimaAsVersion.getMinorVersion() > 6 || (UimaAsVersion.getMinorVersion() == 6 && 
+                UimaAsVersion.getBuildRevision() > 1)))) {
+            enablePerformanceBreakdownReporting = true;
+        }
+
 		// generate Spring context file once
 		synchronized( UimaASProcessContainer.class) {
 			if ( !initialized ) {