Author: indika
Date: Tue Jan  6 23:54:37 2009
New Revision: 28196
URL: http://wso2.org/svn/browse/wso2?view=rev&revision=28196

Log:
relate with previous commit

Modified:
   
branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java

Modified: 
branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java
URL: 
http://wso2.org/svn/browse/wso2/branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java?rev=28196&r1=28195&r2=28196&view=diff
==============================================================================
--- 
branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java
  (original)
+++ 
branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java
  Tue Jan  6 23:54:37 2009
@@ -359,22 +359,24 @@
         *            the key for which the Entry is required
         * @return its value
         */
-       public Entry getEntryDefinition(String key) {
-               Object o = localRegistry.get(key);
-               if (o == null || o instanceof Entry) {
-                       if (o == null) {
-                               // this is not a local definition
-                               Entry entry = new Entry(key);
-                               entry.setType(Entry.REMOTE_ENTRY);
-                               addEntry(key, entry);
-                               return entry;
-                       }
-                       return (Entry) o;
-               } else {
-                       handleException("Invalid local registry entry : " + 
key);
-                       return null;
-               }
-       }
+    public Entry getEntryDefinition(String key) {
+        Object o = localRegistry.get(key);
+        if (o == null || o instanceof Entry) {
+            if (o == null) {
+                // this is not a local definition
+                Entry entry = new Entry(key);
+                entry.setType(Entry.REMOTE_ENTRY);
+                addEntry(key, entry);
+                return entry;
+            }
+            return (Entry) o;
+        } else {
+            if (log.isDebugEnabled()) {
+                log.debug("There is no local registry entry for key : " + key);
+            }
+            return null;
+        }
+    }
 
        /**
         * Deletes any reference mapped to the given key from the local registry
@@ -393,7 +395,7 @@
      */
     public void clearCachedEntry(String key) {
         Entry entry = getEntryDefinition(key);
-        if (entry.isDynamic() && entry.isCached()) {
+        if (entry != null && entry.isDynamic() && entry.isCached()) {
             entry.clearCache();
         }
     }

_______________________________________________
Esb-java-dev mailing list
[email protected]
https://wso2.org/cgi-bin/mailman/listinfo/esb-java-dev

Reply via email to