--- CircuitBreaker/src/dk/thoerup/curcuitbreaker/CircuitBreaker.java	2009/10/20 10:47:36	452
+++ CircuitBreaker/src/dk/thoerup/circuitbreaker/CircuitBreaker.java	2010/06/21 17:16:46	871
@@ -1,8 +1,8 @@
-package dk.thoerup.curcuitbreaker;
+package dk.thoerup.circuitbreaker;
 
 
-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
  * 
@@ -58,8 +58,9 @@
 		open.setTimeout(timeoutMS);
 		
 		this.name = name;
-		
-		reset();
+	
+		//set correct intial state
+		internalReset();
 	}
 	
 	
@@ -81,16 +82,25 @@
     }
     
     public void tripBreaker() {
-    	synchronized(this) {
+    	commonTripBreaker(Notifier.Event.BreakerTripped);
+    }
+    
+	//a re-trip should basically do the same as a normal trip, but it is here just to differentiate the two different events
+    public void retripBreaker() {
+    	commonTripBreaker(Notifier.Event.BreakerRetripped);
+    }
+    
+    private void commonTripBreaker(Notifier.Event event) {
+       	synchronized(this) {
     		if (currentState != open) { // TODO:Is this conditional necessary ??
     			open.trip();
     			currentState = open;
     		
-    			notifier.sendNotification(name, Notifier.Event.BreakerTripped);
+    			notifier.sendNotification(name, event);
     		}
-    	}    
+    	}   	
     }
-    
+
     public void attemptReset() {
     	synchronized(this) {
     		if (currentState != halfOpen) { // TODO:Is this conditional necessary ??
@@ -104,12 +114,18 @@
     public void reset() {
     	synchronized(this) {
     		if (currentState != closed) { // TODO: Is this conditional necessary ??
-    			currentState = closed;
+    			internalReset();
     			notifier.sendNotification(name, Notifier.Event.BreakerReset);
     		}
     	}
     }
     
+    //This one actually sets the correct closed/reset state 
+    private void internalReset() {
+		closed.resetFailureCount();
+		currentState = closed;    	
+    }
+    
     
     private CircuitBreakerState getState() {
     	synchronized(this) {