From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Tue, 29 Mar 2011 05:00:57 +0000 (+0200)
Subject: Merge branch 'master' of git.dolda2000.com:/srv/git/r/jsvc
X-Git-Url: http://www.dolda2000.com/gitweb/?p=jsvc.git;a=commitdiff_plain;h=f05313f6190e2ddb2caaac60f7d7d242913d47b3;hp=-c

Merge branch 'master' of git.dolda2000.com:/srv/git/r/jsvc
---

f05313f6190e2ddb2caaac60f7d7d242913d47b3
diff --combined src/dolda/jsvc/ThreadContext.java
index 36b0121,8e544d3..6eb7d87
--- a/src/dolda/jsvc/ThreadContext.java
+++ b/src/dolda/jsvc/ThreadContext.java
@@@ -118,8 -118,8 +118,8 @@@ public class ThreadContext extends Thre
      }
      
      public void shutdown() {
 -	if(root instanceof ContextResponder)
 -	    ((ContextResponder)root).destroy();
 +	if(root instanceof Destroyable)
 +	    ((Destroyable)root).destroy();
  	try {
  	    long last = 0;
  	    while(true) {
@@@ -143,6 -143,10 +143,10 @@@
  	return(ctx.worker(root, req, workers, "Worker thread " + reqs++));
      }
      
+     public long requests() {
+ 	return(reqs);
+     }
+     
      private Responder bootstrap(final Class<?> bootclass) {
  	final Throwable[] err = new Throwable[1];
  	final Responder[] res = new Responder[1];