Author: indika
Date: Mon Dec 3 02:59:24 2007
New Revision: 10425
Log:
Modified:
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/EntriesAdmin.java
Modified:
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/EntriesAdmin.java
==============================================================================
---
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/EntriesAdmin.java
(original)
+++
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/EntriesAdmin.java
Mon Dec 3 02:59:24 2007
@@ -310,13 +310,11 @@
SynapseConfiguration synapseConfiguration = getSynapseConfiguration();
Map gloabalEntriesMap = synapseConfiguration.getLocalRegistry();
List propKeys = new ArrayList();
- Iterator itr = gloabalEntriesMap.keySet().iterator();
- Iterator itr2 = gloabalEntriesMap.values().iterator();
- while (itr.hasNext()) {
- if (itr2.next() instanceof Entry) {
- propKeys.add(itr.next().toString());
- } else {
- itr.next();
+ Iterator values = gloabalEntriesMap.values().iterator();
+ while (values.hasNext()) {
+ Object entryValue = values.next();
+ if (entryValue instanceof Entry) {
+ propKeys.add(((Entry) entryValue).getKey());
}
}
return (String[]) propKeys.toArray(new String[propKeys.size()]);
@@ -326,21 +324,26 @@
SynapseConfiguration synapseConfiguration = getSynapseConfiguration();
Map gloabalEntriesMap = synapseConfiguration.getLocalRegistry();
StringBuffer propKeys = new StringBuffer();
- Iterator itr = gloabalEntriesMap.keySet().iterator();
- Iterator itr2 = gloabalEntriesMap.values().iterator();
- while (itr.hasNext()) {
- Object entryValue = itr2.next();
+ Iterator values = gloabalEntriesMap.values().iterator();
+ while (values.hasNext()) {
+ Object entryValue = values.next();
if (entryValue instanceof Endpoint) {
- propKeys.append("[Enpoint]-"+itr.next().toString() + " ");
+ Endpoint endpoint = (Endpoint) entryValue;
+ String name = endpoint.getName();
+ if (name != null) {
+ propKeys.append("[Enpoint]-" + name + " ");
+ }
} else if (entryValue instanceof SequenceMediator) {
- propKeys.append("[Sequence]-"+itr.next().toString() + " ");
+ SequenceMediator sequenceMediator = (SequenceMediator)
entryValue;
+ String name = sequenceMediator.getName();
+ if (name != null) {
+ propKeys.append("[Sequence]-" + name + " ");
+ }
} else if (entryValue instanceof Entry) {
Entry entry = (Entry) entryValue;
if (!entry.isDynamic() && !entry.isRemote()) { // only care
pre-defined local entries
- propKeys.append("[Entry]-" + itr.next().toString() + " ");
+ propKeys.append("[Entry]-" + entry.getKey() + " ");
}
- } else {
- itr.next();
}
}
return propKeys.toString();
_______________________________________________
Esb-java-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/esb-java-dev
