Author: asmuts
Date: Mon Nov 24 14:19:56 2008
New Revision: 720309
URL: http://svn.apache.org/viewvc?rev=720309&view=rev
Log:
protecting aux call properly
Modified:
jakarta/jcs/trunk/src/java/org/apache/jcs/engine/control/CompositeCache.java
Modified:
jakarta/jcs/trunk/src/java/org/apache/jcs/engine/control/CompositeCache.java
URL:
http://svn.apache.org/viewvc/jakarta/jcs/trunk/src/java/org/apache/jcs/engine/control/CompositeCache.java?rev=720309&r1=720308&r2=720309&view=diff
==============================================================================
---
jakarta/jcs/trunk/src/java/org/apache/jcs/engine/control/CompositeCache.java
(original)
+++
jakarta/jcs/trunk/src/java/org/apache/jcs/engine/control/CompositeCache.java
Mon Nov 24 14:19:56 2008
@@ -904,25 +904,25 @@
log.debug( "Attempting to get from aux [" +
aux.getCacheName() + "] which is of type: "
+ cacheType );
}
- }
+
+ try
+ {
+ elementsFromAuxiliary.putAll( aux.getMatching( pattern
) );
+ }
+ catch ( IOException e )
+ {
+ log.error( "Error getting from aux", e );
+ }
+
+ if ( log.isDebugEnabled() )
+ {
+ log.debug( "Got CacheElements: " +
elementsFromAuxiliary );
+ }
- try
- {
- elementsFromAuxiliary.putAll( aux.getMatching( pattern ) );
- }
- catch ( IOException e )
- {
- log.error( "Error getting from aux", e );
- }
+ processRetrievedElements( i, elementsFromAuxiliary );
- if ( log.isDebugEnabled() )
- {
- log.debug( "Got CacheElements: " + elementsFromAuxiliary );
+ elements.putAll( elementsFromAuxiliary );
}
-
- processRetrievedElements( i, elementsFromAuxiliary );
-
- elements.putAll( elementsFromAuxiliary );
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
