[Gzz-commits] storm/org/nongnu/storm BlockId.java http/client...

[Hermanni Hyytiälä]

CVSROOT:        /cvsroot/storm
Module name:    storm
Changes by:     Hermanni Hyytiälä <address@hidden>      03/04/28 05:22:49

Modified files:
        org/nongnu/storm: BlockId.java 
        org/nongnu/storm/http/client: testSimpleHTTPClient.test 
        org/nongnu/storm/util: HTTPProxy.java 

Log message:
        Handle threads properly

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/org/nongnu/storm/BlockId.java.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/org/nongnu/storm/http/client/testSimpleHTTPClient.test.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/org/nongnu/storm/util/HTTPProxy.java.diff?tr1=1.12&tr2=1.13&r1=text&r2=text

Patches:
Index: storm/org/nongnu/storm/BlockId.java
diff -u storm/org/nongnu/storm/BlockId.java:1.15 
storm/org/nongnu/storm/BlockId.java:1.16
--- storm/org/nongnu/storm/BlockId.java:1.15    Fri Apr 25 12:55:27 2003
+++ storm/org/nongnu/storm/BlockId.java Mon Apr 28 05:22:49 2003
@@ -49,9 +49,12 @@
     public BlockId(String uri) throws IllegalArgumentException {
        uri = uri.toLowerCase().intern();
        this.uri = uri;
-
-        int dot = uri.lastIndexOf('.');
+               
+       int dot = uri.lastIndexOf('.');
        int comma = uri.lastIndexOf(',');
+<<<<<<< BlockId.java
+       
+=======
 
        if(!uri.startsWith(PREFIX))
            throw new IllegalArgumentException("Storm URN must start "+PREFIX);
@@ -62,6 +65,7 @@
        if(uri.length() - dot != 39 + 1) 
            throw new IllegalArgumentException("2nd hash must be 39 chars");
 
+>>>>>>> 1.13
        contentType = uri.substring(PREFIX_LEN, comma);
        checkContentType(contentType);
 
Index: storm/org/nongnu/storm/http/client/testSimpleHTTPClient.test
diff -u storm/org/nongnu/storm/http/client/testSimpleHTTPClient.test:1.3 
storm/org/nongnu/storm/http/client/testSimpleHTTPClient.test:1.4
--- storm/org/nongnu/storm/http/client/testSimpleHTTPClient.test:1.3    Mon Apr 
28 03:59:39 2003
+++ storm/org/nongnu/storm/http/client/testSimpleHTTPClient.test        Mon Apr 
28 05:22:49 2003
@@ -48,7 +48,7 @@
 def testHTTPClient():
 
         empty = java.util.Collections.EMPTY_SET
-        pool = DirPool(java.io.File("/home/hemppah/cvs/storm"), empty)
+        pool = TransientPool(empty)         
         
         #pub = TransientPool(empty)
         #cache = TransientPool(empty)
@@ -57,7 +57,9 @@
         #pool = peer.getPool()
         
         
-        java.lang.Thread(HTTPProxy(pool, 5555)).start()
+        serverthread = java.lang.Thread(HTTPProxy(pool, 5555))
+         serverthread.start()         
+         
         
         print "HTTP proxy thread started..."
         
@@ -72,5 +74,5 @@
         
         httpconn.close
         #java.lang.Thread.currentThread().interrupt()
-        java.lang.Thread.interrupt()
+        java.lang.Thread(serverthread).interrupt()
         print "HTTP proxy thread stopped..."    
Index: storm/org/nongnu/storm/util/HTTPProxy.java
diff -u storm/org/nongnu/storm/util/HTTPProxy.java:1.12 
storm/org/nongnu/storm/util/HTTPProxy.java:1.13
--- storm/org/nongnu/storm/util/HTTPProxy.java:1.12     Sat Apr 26 04:40:55 2003
+++ storm/org/nongnu/storm/util/HTTPProxy.java  Mon Apr 28 05:22:49 2003
@@ -79,7 +79,8 @@
        protected HTTPResponse doGet(HTTPRequest req, 
                                     HTTPResponse.Factory resf) throws 
IOException {
            try {
-               String uri = req.getRequestURI();
+               
+               String uri = req.getRequestURI();               
                if(uri.startsWith("/")) uri = uri.substring(1);
 
                boolean rewrite = false;