--- CircuitBreaker/src/dk/thoerup/curcuitbreaker/CircuitBreaker.java	2009/10/07 07:07:00	409
+++ CircuitBreaker/src/dk/thoerup/circuitbreaker/CircuitBreaker.java	2010/03/08 10:01:25	626
@@ -1,9 +1,8 @@
-package dk.thoerup.curcuitbreaker;
+package dk.thoerup.circuitbreaker;
 
-import java.util.logging.Logger;
 
-import dk.thoerup.curcuitbreaker.notification.Notifier;
-import dk.thoerup.curcuitbreaker.notification.NullNotifier;
+import dk.thoerup.circuitbreaker.notification.Notifier;
+import dk.thoerup.circuitbreaker.notification.NullNotifier;
 
 /* Simple CircuitBreaker implementation - snipped from http://www.jroller.com/kenwdelong/entry/circuit_breaker_in_java
  * 
@@ -32,7 +31,7 @@
 		try {
 			String s = (String) cb.invoke(new TestInvocation("http://rafiki/test"));
 			response.getWriter().print(s);
-		} catch (Throwable e) {
+		} catch (Exception e) {
 			logger.warning( e.getMessage() );
 			response.sendError(500);
 			return;
@@ -43,14 +42,12 @@
 
 
 public class CircuitBreaker{
-	Logger logger = Logger.getLogger(CircuitBreaker.class.getName());
-
 	
-	private CircuitBreakerState currentState;
+	private volatile CircuitBreakerState currentState;
 	
-	private OpenState open = new OpenState();
-	private HalfOpenState halfOpen = new HalfOpenState();
-	private ClosedState closed = new ClosedState();
+	private final OpenState open = new OpenState();
+	private final HalfOpenState halfOpen = new HalfOpenState();
+	private final ClosedState closed = new ClosedState();
 	
 	private String name;
 	
@@ -61,12 +58,14 @@
 		open.setTimeout(timeoutMS);
 		
 		this.name = name;
-		
-		reset();
+	
+		// Initial state is closed - like a reset() was called initially
+		closed.resetFailureCount();
+		currentState = closed;
 	}
 	
 	
-    public Object invoke(CircuitInvocation invocation) throws Throwable
+    public Object invoke(CircuitInvocation invocation) throws Exception
     {
     	Object result = null;
         try
@@ -75,35 +74,42 @@
             result = invocation.proceed();
             getState().postInvoke(this);
         }
-        catch(Throwable t)
+        catch(Exception e)
         {
-            getState().onError(this, t);
-            throw t;
+            getState().onError(this, e);
+            throw e;
         }
         return result;
     }
     
     public void tripBreaker() {
     	synchronized(this) {
-    		open.trip();
-    		currentState = open;
+    		if (currentState != open) { // TODO:Is this conditional necessary ??
+    			open.trip();
+    			currentState = open;
     		
-    		notifier.sendNotification(name, Notifier.Event.BreakerTripped);
+    			notifier.sendNotification(name, Notifier.Event.BreakerTripped);
+    		}
     	}    
     }
     
     public void attemptReset() {
     	synchronized(this) {
-    		currentState = halfOpen;
-        	notifier.sendNotification(name, Notifier.Event.BreakerAttemptReset);
+    		if (currentState != halfOpen) { // TODO:Is this conditional necessary ??
+    			currentState = halfOpen;
+    			notifier.sendNotification(name, Notifier.Event.BreakerAttemptReset);
+    		}
     	}
     	
     }
     
     public void reset() {
     	synchronized(this) {
-    		currentState = closed;
-        	notifier.sendNotification(name, Notifier.Event.BreakerReset);
+    		if (currentState != closed) { // TODO: Is this conditional necessary ??
+    			closed.resetFailureCount();
+    			currentState = closed;
+    			notifier.sendNotification(name, Notifier.Event.BreakerReset);
+    		}
     	}
     }
     
@@ -114,6 +120,14 @@
     	}
     }
     
+    public boolean isClosed() {
+    	return (getState() == closed); 
+    }
+    
+    public boolean isOpen() {
+    	return (getState() == open); 
+    }
+    
     public String getName() {
     	return name;
     }
@@ -126,6 +140,10 @@
     	return closed.getThreshold();
     }
     
+    public int getTimeout() {
+    	return (int)open.getTimeout();
+    }
+    
     public int getFailureCount() {
     	if (getState() == closed) {
     		return closed.getFailureCount();
@@ -147,7 +165,7 @@
     }
     
     public String getNotifierName() {
-    	return notifier.toString();
+    	return notifier.getClass().getName();
     }
  
 }