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 2013/02/11 12:00:43 UTC
svn commit: r1444735 -
/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java
Author: degenaro
Date: Mon Feb 11 11:00:42 2013
New Revision: 1444735
URL: http://svn.apache.org/r1444735
Log:
UIMA-2655 DUCC webserver (WS) should not display unsightly "null" within Log file name or as PID on Processes tab
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java?rev=1444735&r1=1444734&r2=1444735&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java Mon Feb 11 11:00:42 2013
@@ -308,6 +308,7 @@ public class DuccHandler extends DuccAbs
String href = "<a href=\""+duccLogData+"?"+"fname="+logsjobdir+logfile+"\" onclick=\"var newWin = window.open(this.href,'child','height=800,width=1200,scrollbars'); newWin.focus(); return false;\">"+logfile+"</a>";
String tr = trGet(counter);
sb.append(tr);
+ String pid = process.getPID();
// Id
sb.append("<td align=\"right\">");
/*
@@ -318,7 +319,9 @@ public class DuccHandler extends DuccAbs
sb.append("</td>");
// Log
sb.append("<td>");
- sb.append(href);
+ if(pid != null) {
+ sb.append(href);
+ }
sb.append("</td>");
// Log Size (in MB)
sb.append("<td align=\"right\">");
@@ -336,7 +339,12 @@ public class DuccHandler extends DuccAbs
*/
// PID
sb.append("<td align=\"right\">");
- sb.append(process.getPID());
+ if(pid != null) {
+ sb.append(pid);
+ }
+ else {
+ sb.append("?");
+ }
sb.append("</td>");
// State:scheduler
sb.append("<td>");