Author: alessio.soldano(a)jboss.com
Date: 2012-12-11 08:19:32 -0500 (Tue, 11 Dec 2012)
New Revision: 17065
Modified:
common/trunk/src/main/java/org/jboss/ws/common/DOMWriter.java
common/trunk/src/main/java/org/jboss/ws/common/configuration/ConfigHelper.java
common/trunk/src/main/java/org/jboss/ws/common/monitoring/LogRecorder.java
common/trunk/src/main/java/org/jboss/ws/common/monitoring/MemoryBufferRecorder.java
Log:
Further minor fixes / improvements
Modified: common/trunk/src/main/java/org/jboss/ws/common/DOMWriter.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/DOMWriter.java 2012-12-11 11:13:27 UTC
(rev 17064)
+++ common/trunk/src/main/java/org/jboss/ws/common/DOMWriter.java 2012-12-11 13:19:32 UTC
(rev 17065)
@@ -66,6 +66,7 @@
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
+import java.util.Map.Entry;
import org.w3c.dom.Attr;
import org.w3c.dom.Element;
@@ -340,11 +341,9 @@
// that are defined further up the tree
if (completeNamespaces)
{
- Iterator<String> itPrefix = nsMap.keySet().iterator();
- while (itPrefix.hasNext())
- {
- String prefix = itPrefix.next();
- String nsURI = nsMap.get(prefix);
+ for (Entry<String, String> e : nsMap.entrySet()) {
+ String prefix = e.getKey();
+ String nsURI = e.getValue();
if (nsURI == null)
{
nsURI = getNamespaceURI(prefix, element, null);
Modified: common/trunk/src/main/java/org/jboss/ws/common/configuration/ConfigHelper.java
===================================================================
---
common/trunk/src/main/java/org/jboss/ws/common/configuration/ConfigHelper.java 2012-12-11
11:13:27 UTC (rev 17064)
+++
common/trunk/src/main/java/org/jboss/ws/common/configuration/ConfigHelper.java 2012-12-11
13:19:32 UTC (rev 17065)
@@ -91,7 +91,10 @@
{
is =
SecurityActions.getContextClassLoader().getResourceAsStream(configFile);
ConfigRoot config = ConfigMetaDataParser.parse(is);
- return config.getClientConfigByName(configName);
+ ClientConfig cc = config.getClientConfigByName(configName);
+ if (cc != null) {
+ return cc;
+ }
}
catch (Exception e)
{
@@ -115,8 +118,8 @@
}
}
}
- throw MESSAGES.configurationNotFound(configName);
}
+ throw MESSAGES.configurationNotFound(configName);
}
/**
Modified: common/trunk/src/main/java/org/jboss/ws/common/monitoring/LogRecorder.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/monitoring/LogRecorder.java 2012-12-11
11:13:27 UTC (rev 17064)
+++ common/trunk/src/main/java/org/jboss/ws/common/monitoring/LogRecorder.java 2012-12-11
13:19:32 UTC (rev 17065)
@@ -24,6 +24,7 @@
import java.io.Serializable;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
import org.jboss.ws.api.monitoring.Record;
import org.jboss.ws.api.monitoring.Record.MessageType;
@@ -103,18 +104,17 @@
Map<String, List<String>> headers = record.getHeaders();
if (this.isProcessHeaders() && headers != null)
{
- for (String key : headers.keySet())
+ for (Entry<String, List<String>> e : headers.entrySet())
{
- sb.append(key);
+ sb.append(e.getKey());
sb.append(": ");
- for (String h : headers.get(key))
+ for (String h : e.getValue())
{
sb.append(h);
sb.append("; ");
}
sb.append("\n");
}
- sb.append("\n");
}
sb.append("\n");
if (this.isProcessEnvelope())
Modified:
common/trunk/src/main/java/org/jboss/ws/common/monitoring/MemoryBufferRecorder.java
===================================================================
---
common/trunk/src/main/java/org/jboss/ws/common/monitoring/MemoryBufferRecorder.java 2012-12-11
11:13:27 UTC (rev 17064)
+++
common/trunk/src/main/java/org/jboss/ws/common/monitoring/MemoryBufferRecorder.java 2012-12-11
13:19:32 UTC (rev 17065)
@@ -28,6 +28,7 @@
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Set;
import java.util.concurrent.ConcurrentLinkedQueue;
@@ -196,11 +197,10 @@
sb.append("</pre></span>");
if (!groupRecords)
openTable(sb, showDetails);
- for (String key : records.keySet())
- {
+ for (Entry<String, List<Record>> e : records.entrySet()) {
if (groupRecords)
openTable(sb, showDetails);
- for (Record record : records.get(key))
+ for (Record record : e.getValue())
{
appendRecordRow(sb, record, showDetails);
}
Show replies by date