You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by de...@apache.org on 2014/04/04 16:52:30 UTC

svn commit: r1584731 - in /uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server: DuccHandlerClassic.java DuccHandlerJsonFormat.java

Author: degenaro
Date: Fri Apr  4 14:52:30 2014
New Revision: 1584731

URL: http://svn.apache.org/r1584731
Log:
UIMA-3682 DUCC WebServer (WS) display of Service Last Use time

Modified:
    uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerClassic.java
    uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerClassic.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerClassic.java?rev=1584731&r1=1584730&r2=1584731&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerClassic.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerClassic.java Fri Apr  4 14:52:30 2014
@@ -943,7 +943,14 @@ public class DuccHandlerClassic extends 
 				// Last Used
 				sb.append("<td>");
 				String lastUse = DuccHandlerUtils.getUninterpreted(propertiesMeta, IServicesRegistry.last_use);
-				sb.append(getTimeStamp(request, jobid, lastUse));
+				try {
+					long value = Long.parseLong(lastUse);
+					if(value > 0) {
+						sb.append(getTimeStamp(request, jobid, lastUse));
+					}
+				}
+				catch(Exception e) {
+				}
 				sb.append("</td>");
 				// Pinging
 				sb.append("<td>");

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java?rev=1584731&r1=1584730&r2=1584731&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java Fri Apr  4 14:52:30 2014
@@ -1086,7 +1086,15 @@ public class DuccHandlerJsonFormat exten
 				row.add(new JsonPrimitive(s0+s1+s2));
 				// Last Used
 				String lastUse = DuccHandlerUtils.getUninterpreted(propertiesMeta, IServicesRegistry.last_use);
-				String time = getTimeStamp(request, jobid, lastUse);
+				String time = "";
+				try {
+					long value = Long.parseLong(lastUse);
+					if(value > 0) {
+						time = getTimeStamp(request, jobid, lastUse);
+					}
+				}
+				catch(Exception e) {
+				}
 				row.add(new JsonPrimitive(time));
 				// Pinging
 				String pinging = DuccHandlerUtils.getInterpretedUpDown(state, propertiesMeta, IServicesRegistry.ping_active);