--- CircuitBreaker/src/dk/thoerup/curcuitbreaker/CircuitBreaker.java	2009/10/05 19:54:25	395
+++ CircuitBreaker/src/dk/thoerup/curcuitbreaker/CircuitBreaker.java	2009/10/09 06:45:40	426
@@ -2,6 +2,9 @@
 
 import java.util.logging.Logger;
 
+import dk.thoerup.curcuitbreaker.notification.Notifier;
+import dk.thoerup.curcuitbreaker.notification.NullNotifier;
+
 /* Simple CircuitBreaker implementation - snipped from http://www.jroller.com/kenwdelong/entry/circuit_breaker_in_java
  * 
  *  example of how it can be used
@@ -45,12 +48,14 @@
 	
 	private 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;
 	
+	private Notifier notifier = new NullNotifier();
+	
 	public CircuitBreaker(String name, int threshold, long timeoutMS) {
 		closed.setThreshold(threshold);
 		open.setTimeout(timeoutMS);
@@ -80,33 +85,79 @@
     
     public void tripBreaker() {
     	synchronized(this) {
-    		currentState = open;
-    		open.trip();
+    		if (currentState != open) { // TODO:Is this conditional necessary ??
+    			open.trip();
+    			currentState = open;
     		
-    		logger.warning("Circuitbreaker tripBreaker - " + name);
-    	}
-    
+    			notifier.sendNotification(name, Notifier.Event.BreakerTripped);
+    		}
+    	}    
     }
     
     public void attemptReset() {
     	synchronized(this) {
-    		currentState = halfOpen;
-    		
-    		logger.warning("Circuitbreaker attemptReset - " + name);
+    		if (currentState != halfOpen) { // TODO:Is this conditional necessary ??
+    			currentState = halfOpen;
+    			notifier.sendNotification(name, Notifier.Event.BreakerAttemptReset);
+    		}
     	}
+    	
     }
     
     public void reset() {
     	synchronized(this) {
-    		currentState = closed;
-    		
-    		logger.warning("Circuitbreaker reset - " + name);
+    		if (currentState != closed) { // TODO: Is this conditional necessary ??
+    			currentState = closed;
+    			notifier.sendNotification(name, Notifier.Event.BreakerReset);
+    		}
     	}
     }
     
+    
     private CircuitBreakerState getState() {
     	synchronized(this) {
     		return currentState;
     	}
     }
+    
+    public String getName() {
+    	return name;
+    }
+    
+    public String getStateName() {
+    	return getState().getName();
+    }
+    
+    public int getThreshold() {
+    	return closed.getThreshold();
+    }
+    
+    public int getTimeout() {
+    	return (int)open.getTimeout();
+    }
+    
+    public int getFailureCount() {
+    	if (getState() == closed) {
+    		return closed.getFailureCount();
+    	} else {
+    		return -1;
+    	}
+    }
+    
+    public long getElapsed() {
+    	if (getState() == open) {
+    		return open.getElapsed();
+    	} else {
+    		return -1;
+    	}
+    }
+    
+    public void setNotifier(Notifier notifier) {
+    	this.notifier = notifier;
+    }
+    
+    public String getNotifierName() {
+    	return notifier.getClass().getName();
+    }
+ 
 }