svn commit: r1749588 - in /uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws: db/DbQuery.java helper/DatabaseHelper.java

[degenaro]

Author: degenaro
Date: Tue Jun 21 19:03:29 2016
New Revision: 1749588

URL: http://svn.apache.org/viewvc?rev=1749588&view=rev
Log:
UIMA-4964 DUCC Web Server (WS) improved test for DB aliveness

Modified:
    
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/db/DbQuery.java
    
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/helper/DatabaseHelper.java

Modified: 
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/db/DbQuery.java
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/db/DbQuery.java?rev=1749588&r1=1749587&r2=1749588&view=diff
==============================================================================
--- 
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/db/DbQuery.java
 (original)
+++ 
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/db/DbQuery.java
 Tue Jun 21 19:03:29 2016
@@ -71,6 +71,10 @@ public class DbQuery {
                return enabled;
        }
        
+       public boolean isUp() {
+               return (getMapMachines().size() > 0);
+       }
+       
        public static void dumpMap(Map<String, IDbMachine> dbMachineMap) {
                String location = "dumpMap";
                if(dbMachineMap != null) {

Modified: 
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/helper/DatabaseHelper.java
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/helper/DatabaseHelper.java?rev=1749588&r1=1749587&r2=1749588&view=diff
==============================================================================
--- 
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/helper/DatabaseHelper.java
 (original)
+++ 
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/helper/DatabaseHelper.java
 Tue Jun 21 19:03:29 2016
@@ -25,6 +25,7 @@ import org.apache.uima.ducc.common.utils
 import org.apache.uima.ducc.common.utils.DuccLoggerComponents;
 import org.apache.uima.ducc.common.utils.DuccPropertiesResolver;
 import org.apache.uima.ducc.common.utils.id.DuccId;
+import org.apache.uima.ducc.ws.db.DbQuery;
 
 public class DatabaseHelper extends JmxHelper {
        
@@ -102,10 +103,7 @@ public class DatabaseHelper extends JmxH
        // Runtime Info //
        
        public boolean isAlive() {
-               boolean retVal = false;
-               if(getPID() != 0) {
-                       retVal = true;
-               }
+               boolean retVal = DbQuery.getInstance().isUp();
                return retVal;
        }