activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cmacn...@apache.org
Subject svn commit: r789860 - /activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/BrokerDatabase.java
Date Tue, 30 Jun 2009 18:09:38 GMT
Author: cmacnaug
Date: Tue Jun 30 18:09:38 2009
New Revision: 789860

URL: http://svn.apache.org/viewvc?rev=789860&view=rev
Log:
Fixing exception thrown trying to list an empty map.

Modified:
    activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/BrokerDatabase.java

Modified: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/BrokerDatabase.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/BrokerDatabase.java?rev=789860&r1=789859&r2=789860&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/BrokerDatabase.java
(original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/BrokerDatabase.java
Tue Jun 30 18:09:38 2009
@@ -58,7 +58,7 @@
 public class BrokerDatabase extends AbstractLimitedFlowResource<BrokerDatabase.OperationBase>
implements Service, DispatcherAware {
 
     private static final boolean DEBUG = false;
-    
+
     private final Store store;
     private final Flow databaseFlow = new Flow("database", false);
 
@@ -83,7 +83,7 @@
     // requested.
     private long flushDelay = 10;
 
-	private final Runnable flushDelayCallback;
+    private final Runnable flushDelayCallback;
     private boolean storeBypass = true;
 
     public interface DatabaseListener {
@@ -225,12 +225,16 @@
 
             public Map<AsciiBuffer, Buffer> execute(Session session) throws Exception
{
                 HashMap<AsciiBuffer, Buffer> ret = new HashMap<AsciiBuffer, Buffer>();
-                Iterator<AsciiBuffer> keys = session.mapEntryListKeys(map, null, -1);
-                while (keys.hasNext()) {
-                    AsciiBuffer key = keys.next();
-                    ret.put(key, session.mapEntryGet(map, key));
+                try {
+                    Iterator<AsciiBuffer> keys = session.mapEntryListKeys(map, null,
-1);
+                    while (keys.hasNext()) {
+                        AsciiBuffer key = keys.next();
+                        ret.put(key, session.mapEntryGet(map, key));
+                    }
+                } catch (Store.KeyNotFoundException knfe) {
+                    //No keys then:
                 }
-
+                
                 return ret;
             }
 
@@ -238,12 +242,15 @@
     }
 
     /**
-     * @param map The name of the map to update.
-     * @param key The key in the map to update.
-     * @param value The value to insert.
+     * @param map
+     *            The name of the map to update.
+     * @param key
+     *            The key in the map to update.
+     * @param value
+     *            The value to insert.
      */
     public OperationContext updateMapEntry(AsciiBuffer map, AsciiBuffer key, Buffer value)
{
-        return add(new MapUpdateOperation(map, key, value), null, false) ;
+        return add(new MapUpdateOperation(map, key, value), null, false);
     }
 
     /**
@@ -708,17 +715,17 @@
         public static final int BASE_MEM_SIZE = 20;
 
         public boolean cancel() {
-        	if( storeBypass ) {
-	            if (executePending.compareAndSet(true, false)) {
-	                cancelled.set(true);
-	                // System.out.println("Cancelled: " + this);
-	                synchronized (opQueue) {
-	                    unlink();
-	                    storeController.elementDispatched(this);
-	                }
-	                return true;
-	            }
-        	}
+            if (storeBypass) {
+                if (executePending.compareAndSet(true, false)) {
+                    cancelled.set(true);
+                    // System.out.println("Cancelled: " + this);
+                    synchronized (opQueue) {
+                        unlink();
+                        storeController.elementDispatched(this);
+                    }
+                    return true;
+                }
+            }
             return cancelled.get();
         }
 
@@ -1281,35 +1288,36 @@
             return "AddTxOpOperation " + record.getKey() + super.toString();
         }
     }
-    
+
     public long getFlushDelay() {
-		return flushDelay;
-	}
+        return flushDelay;
+    }
 
-	public void setFlushDelay(long flushDelay) {
-		this.flushDelay = flushDelay;
-	}
-
-	/**
-	 * @return true if operations are allowed to bypass the store.
-	 */
-	public boolean isStoreBypass() {
-		return storeBypass;
-	}
-
-	/**
-	 * Sets if persistent operations should be allowed to bypass the store.
-	 * Defaults to true, as this will give you the best performance.  In some  
-	 * cases, you want to disable this as the store being used will double
-	 * as an audit log and you do not want any persistent operations
-	 * to bypass the store.
-	 * 
-	 * When store bypass is disabled, all {@link Operation#cancel()} requests
-	 * will return false.
-	 * 
-	 * @param enable if true will enable store bypass
-	 */
-	public void setStoreBypass(boolean enable) {
-		this.storeBypass = enable;
-	}
+    public void setFlushDelay(long flushDelay) {
+        this.flushDelay = flushDelay;
+    }
+
+    /**
+     * @return true if operations are allowed to bypass the store.
+     */
+    public boolean isStoreBypass() {
+        return storeBypass;
+    }
+
+    /**
+     * Sets if persistent operations should be allowed to bypass the store.
+     * Defaults to true, as this will give you the best performance. In some
+     * cases, you want to disable this as the store being used will double as an
+     * audit log and you do not want any persistent operations to bypass the
+     * store.
+     * 
+     * When store bypass is disabled, all {@link Operation#cancel()} requests
+     * will return false.
+     * 
+     * @param enable
+     *            if true will enable store bypass
+     */
+    public void setStoreBypass(boolean enable) {
+        this.storeBypass = enable;
+    }
 }



Mime
View raw message