Author: richard.opalka(a)jboss.com
Date: 2012-12-17 08:19:50 -0500 (Mon, 17 Dec 2012)
New Revision: 17093
Modified:
common/trunk/src/main/java/org/jboss/ws/common/IOUtils.java
common/trunk/src/main/java/org/jboss/ws/common/configuration/ConfigHelper.java
common/trunk/src/main/java/org/jboss/ws/common/monitoring/MemoryBufferRecorder.java
Log:
[JBWS-3573] fixing some violations
Modified: common/trunk/src/main/java/org/jboss/ws/common/IOUtils.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/IOUtils.java 2012-12-17 09:43:30 UTC
(rev 17092)
+++ common/trunk/src/main/java/org/jboss/ws/common/IOUtils.java 2012-12-17 13:19:50 UTC
(rev 17093)
@@ -117,35 +117,6 @@
}
}
- /**
- * Transform a Reader to an InputStream
- * Background is that DocumentBuilder.parse() cannot take the Reader directly
- */
- public static InputStream transformReader(Reader reader) throws IOException
- {
- try
- {
- int capacity = 1024;
- char[] charBuffer = new char[capacity];
- StringBuilder strBuffer = new StringBuilder(capacity);
-
- int len = reader.read(charBuffer, 0, capacity);
- while (len > 0)
- {
- strBuffer.append(charBuffer, 0, len);
- len = reader.read(charBuffer, 0, capacity);
- }
- return new ByteArrayInputStream(strBuffer.toString().getBytes());
- }
- catch (IOException e)
- {
- throw e;
- }
- finally{
- reader.close();
- }
- }
-
public static File createTempDirectory() throws IOException
{
File tmpdir = null;
@@ -162,6 +133,7 @@
catch (Throwable t)
{
// Use the Java temp directory if there is no server config (the client)
+ tmpdir = null;
}
return tmpdir;
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-17
09:43:30 UTC (rev 17092)
+++
common/trunk/src/main/java/org/jboss/ws/common/configuration/ConfigHelper.java 2012-12-17
13:19:50 UTC (rev 17093)
@@ -90,10 +90,12 @@
try
{
is =
SecurityActions.getContextClassLoader().getResourceAsStream(configFile);
- ConfigRoot config = ConfigMetaDataParser.parse(is);
- ClientConfig cc = config.getClientConfigByName(configName);
- if (cc != null) {
- return cc;
+ if (is != null) {
+ ConfigRoot config = ConfigMetaDataParser.parse(is);
+ ClientConfig cc = config.getClientConfigByName(configName);
+ if (cc != null) {
+ return cc;
+ }
}
}
catch (Exception e)
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-17
09:43:30 UTC (rev 17092)
+++
common/trunk/src/main/java/org/jboss/ws/common/monitoring/MemoryBufferRecorder.java 2012-12-17
13:19:50 UTC (rev 17093)
@@ -52,7 +52,7 @@
private Map<String, List<Record>> recentRecords =
Collections.synchronizedMap(new HashMap<String, List<Record>>());
private ConcurrentLinkedQueue<String> recentRecordGroups = new
ConcurrentLinkedQueue<String>();
private int size = 0;
- private int maxSize = 50;
+ private volatile int maxSize = 50;
public MemoryBufferRecorder()
{
Show replies by date