Author: hadrian
Date: Thu May 31 13:31:59 2012
New Revision: 1344716
URL: http://svn.apache.org/viewvc?rev=1344716&view=rev
Log:
CS fixes
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/util/jsse/BaseSSLContextParameters.java
camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseConsumer.java
camel/trunk/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/CamelHBaseTestSupport.java
camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamEndpoint.java
camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamProducer.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/util/jsse/BaseSSLContextParameters.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/jsse/BaseSSLContextParameters.java?rev=1344716&r1=1344715&r2=1344716&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/util/jsse/BaseSSLContextParameters.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/util/jsse/BaseSSLContextParameters.java
Thu May 31 13:31:59 2012
@@ -736,13 +736,13 @@ public abstract class BaseSSLContextPara
@Override
public String toString() {
- return String.format("SSLContext[provider=%s, protocol=%s,
needClientAuth=%s, "
- +
"wantClientAuth=%s\n\tdefaultProtocols=%s\n\tdefaultChiperSuites=%s\n\tsupportedProtocols=%s\n\tsupportedChiperSuites=%s\n]",
- getProvider(), getProtocol(),
getDefaultSSLParameters().getNeedClientAuth(),
getDefaultSSLParameters().getWantClientAuth(),
-
collectionAsCommaDelimitedString(getDefaultSSLParameters().getProtocols()),
-
collectionAsCommaDelimitedString(getDefaultSSLParameters().getCipherSuites()),
-
collectionAsCommaDelimitedString(getSupportedSSLParameters().getProtocols()),
-
collectionAsCommaDelimitedString(getSupportedSSLParameters().getCipherSuites()));
+ return String.format("SSLContext[provider=%s, protocol=%s,
needClientAuth=%s, "
+ +
"wantClientAuth=%s\n\tdefaultProtocols=%s\n\tdefaultChiperSuites=%s\n\tsupportedProtocols=%s\n\tsupportedChiperSuites=%s\n]",
+ getProvider(), getProtocol(),
getDefaultSSLParameters().getNeedClientAuth(),
getDefaultSSLParameters().getWantClientAuth(),
+
collectionAsCommaDelimitedString(getDefaultSSLParameters().getProtocols()),
+
collectionAsCommaDelimitedString(getDefaultSSLParameters().getCipherSuites()),
+
collectionAsCommaDelimitedString(getSupportedSSLParameters().getProtocols()),
+
collectionAsCommaDelimitedString(getSupportedSSLParameters().getCipherSuites()));
}
}
Modified:
camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseConsumer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseConsumer.java?rev=1344716&r1=1344715&r2=1344716&view=diff
==============================================================================
---
camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseConsumer.java
(original)
+++
camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseConsumer.java
Thu May 31 13:31:59 2012
@@ -181,7 +181,7 @@ public class HBaseConsumer extends Sched
table = tablePool.getTable(tableName);
endpoint.getRemoveHandler().remove(table, row);
} finally {
- table.close();
+ table.close();
}
}
Modified:
camel/trunk/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/CamelHBaseTestSupport.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/CamelHBaseTestSupport.java?rev=1344716&r1=1344715&r2=1344716&view=diff
==============================================================================
---
camel/trunk/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/CamelHBaseTestSupport.java
(original)
+++
camel/trunk/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/CamelHBaseTestSupport.java
Thu May 31 13:31:59 2012
@@ -41,7 +41,7 @@ public abstract class CamelHBaseTestSupp
try {
hbaseUtil.startMiniCluster(numServers);
} catch (Exception e) {
- systemReady = false;
+ systemReady = false;
}
}
Modified:
camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamEndpoint.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamEndpoint.java?rev=1344716&r1=1344715&r2=1344716&view=diff
==============================================================================
---
camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamEndpoint.java
(original)
+++
camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamEndpoint.java
Thu May 31 13:31:59 2012
@@ -41,7 +41,7 @@ public class StreamEndpoint extends Defa
private long promptDelay;
private long initialPromptDelay = 2000;
private int groupLines;
- private int autoCloseCount = 0;
+ private int autoCloseCount;
private Charset charset;
private GroupStrategy groupStrategy = new DefaultGroupStrategy();
Modified:
camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamProducer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamProducer.java?rev=1344716&r1=1344715&r2=1344716&view=diff
==============================================================================
---
camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamProducer.java
(original)
+++
camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamProducer.java
Thu May 31 13:31:59 2012
@@ -73,7 +73,7 @@ public class StreamProducer extends Defa
public void process(Exchange exchange) throws Exception {
delay(endpoint.getDelay());
- synchronized(this) {
+ synchronized (this) {
openStream(exchange);
writeToStream(outputStream, exchange);
closeStream(false);
