Bug fixes to stopHandler (hook it up to the context path, and allow i…

…t to respond before shutting down.
Cerenaut · Jul 21, 2016 · 43eec9b · 43eec9b
1 parent 024bd7d
commit 43eec9b
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 13 deletions.
diff --git a/.idea/agi.iml b/.idea/agi.iml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/code/core/core.iml b/code/core/core.iml
@@ -9,7 +9,6 @@
     </content>
     <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="libsvm" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-dbcp2:2.1.1" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.4.2" level="project" />
     <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
@@ -25,5 +24,6 @@
     <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3" level="project" />
     <orderEntry type="library" name="Maven: commons-io:commons-io:2.2" level="project" />
     <orderEntry type="library" name="Maven: javax.servlet:servlet-api:2.5" level="project" />
+    <orderEntry type="library" name="Maven: tw.edu.ntu.csie:libsvm:3.17" level="project" />
   </component>
 </module>
diff --git a/code/core/src/io/agi/framework/coordination/http/HttpCoordination.java b/code/core/src/io/agi/framework/coordination/http/HttpCoordination.java
@@ -94,7 +94,7 @@ public void addHandlers() {
         HttpUtil.AddHandler( _s, HttpExportHandler.CONTEXT, exh );
         HttpUtil.AddHandler( _s, HttpConfigHandler.CONTEXT, ch );
         HttpUtil.AddHandler( _s, HttpVersionHandler.CONTEXT, vh );
-        HttpUtil.AddHandler( _s, HttpStopHandler.CONTEXT, vh );
+        HttpUtil.AddHandler( _s, HttpStopHandler.CONTEXT, sh );
     }
 
     /**

diff --git a/code/core/src/io/agi/framework/coordination/http/HttpStopHandler.java b/code/core/src/io/agi/framework/coordination/http/HttpStopHandler.java
@@ -48,16 +48,11 @@ public void handle( HttpExchange t ) throws IOException {
         String response = "Bad request.";
         int status = 400;
 
-        try {
-            _n.stop();
-
-            status = 200;
-            response = "Stopping node...";
-        }
-        catch( Exception e ) {
-            logger.error( e.getStackTrace() );
-        }
+        status = 200;
+        response = "Stopping node...";
 
         HttpUtil.SendResponse( t, status, response );
+
+        _n.stop();
     }
 }