svn commit: r1839334 - in /uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws: server/nodeviz/VisualizedHost.java utils/BasicsHelper.java

[de...@apache.org]

Author: degenaro
Date: Mon Aug 27 14:19:48 2018
New Revision: 1839334

URL: http://svn.apache.org/viewvc?rev=1839334&view=rev
Log:
UIMA-5857 DUCC Web Server (WS) NumberFormatException

Added:
    uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/utils/BasicsHelper.java   (with props)
Modified:
    uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/VisualizedHost.java

Modified: uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/VisualizedHost.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/VisualizedHost.java?rev=1839334&r1=1839333&r2=1839334&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/VisualizedHost.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/VisualizedHost.java Mon Aug 27 14:19:48 2018
@@ -27,6 +27,7 @@ import java.util.List;
 import org.apache.uima.ducc.common.utils.DuccLogger;
 import org.apache.uima.ducc.transport.event.common.IDuccTypes.DuccType;
 import org.apache.uima.ducc.ws.MachineInfo;
+import org.apache.uima.ducc.ws.utils.BasicsHelper;
 
 class VisualizedHost
 {
@@ -53,8 +54,8 @@ class VisualizedHost
         this.quantum = quantum;
         this.name = NodeViz.strip(info.getName());
         this.ip = info.getIp();
-        this.mem_total = Integer.parseInt(info.getMemTotal());
-        this.mem_reserve = Integer.parseInt(info.getMemReserve());
+        this.mem_total = BasicsHelper.safeString2Int(info.getMemTotal());
+        this.mem_reserve = BasicsHelper.safeString2Int(info.getMemReserve());
         this.shares_reserve = (mem_reserve / quantum);
         this.shares_free = shares_reserve;    
     }

Added: uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/utils/BasicsHelper.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/utils/BasicsHelper.java?rev=1839334&view=auto
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/utils/BasicsHelper.java (added)
+++ uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/utils/BasicsHelper.java Mon Aug 27 14:19:48 2018
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+*/
+package org.apache.uima.ducc.ws.utils;
+
+import org.apache.uima.ducc.common.utils.DuccLogger;
+import org.apache.uima.ducc.common.utils.id.DuccId;
+
+public class BasicsHelper {
+
+	private static DuccLogger logger = DuccLogger.getLogger(BasicsHelper.class);
+	private static DuccId jobid = null;
+	
+	public static int safeString2Int(String value) {
+		return safeString2Int(value,0);
+	}
+	
+	public static int safeString2Int(String value, int defaultValue) {
+		String location = "safeString2Int";
+		int retVal = defaultValue;
+		try {
+			retVal = Integer.parseInt(value);
+		}
+		catch(Exception e) {
+			logger.debug(location, jobid, e);
+		}
+		return retVal;
+	}
+}

Propchange: uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/utils/BasicsHelper.java
------------------------------------------------------------------------------
    svn:eol-style = native