You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2018/07/04 14:15:20 UTC

[camel] branch master updated (8d754bf -> 8fdd165)

This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.


    from 8d754bf  CAMEL-11327: improve Salesforce consumer shutdown
     new b5ec782  Fixed CS
     new 8fdd165  Fixed CS

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 ...syncProcessorAwaitManagerInterruptWithRedeliveryTest.java | 12 ++++++------
 .../org/apache/camel/util/jsse/KeyStoreParametersTest.java   |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)


[camel] 02/02: Fixed CS

Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 8fdd165896992427281e261343bcb4b01e901e28
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Jul 4 16:14:43 2018 +0200

    Fixed CS
---
 .../test/java/org/apache/camel/util/jsse/KeyStoreParametersTest.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/camel-core/src/test/java/org/apache/camel/util/jsse/KeyStoreParametersTest.java b/camel-core/src/test/java/org/apache/camel/util/jsse/KeyStoreParametersTest.java
index 04b4912..17ea8c6 100644
--- a/camel-core/src/test/java/org/apache/camel/util/jsse/KeyStoreParametersTest.java
+++ b/camel-core/src/test/java/org/apache/camel/util/jsse/KeyStoreParametersTest.java
@@ -103,7 +103,7 @@ public class KeyStoreParametersTest extends AbstractJsseParametersTest {
     }
     
     public void testExplicitInvalidType() throws Exception {
-    	KeyStoreParameters ksp = this.createMinimalKeyStoreParameters();
+        KeyStoreParameters ksp = this.createMinimalKeyStoreParameters();
         ksp.setType("1234");
         
         try {


[camel] 01/02: Fixed CS

Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit b5ec782e3ba5e9e45b578c2f02d75b2fd6fb1c50
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Jul 4 16:09:51 2018 +0200

    Fixed CS
---
 ...syncProcessorAwaitManagerInterruptWithRedeliveryTest.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/camel-core/src/test/java/org/apache/camel/processor/async/AsyncProcessorAwaitManagerInterruptWithRedeliveryTest.java b/camel-core/src/test/java/org/apache/camel/processor/async/AsyncProcessorAwaitManagerInterruptWithRedeliveryTest.java
index c400d4d..019d6ff 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/async/AsyncProcessorAwaitManagerInterruptWithRedeliveryTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/async/AsyncProcessorAwaitManagerInterruptWithRedeliveryTest.java
@@ -16,18 +16,18 @@
  */
 package org.apache.camel.processor.async;
 
+import java.util.Collection;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.RejectedExecutionException;
+import java.util.concurrent.TimeUnit;
+import javax.naming.Context;
+
 import org.apache.camel.CamelExecutionException;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.spi.AsyncProcessorAwaitManager;
 import org.apache.camel.util.jndi.JndiContext;
 
-import javax.naming.Context;
-import java.util.Collection;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.RejectedExecutionException;
-import java.util.concurrent.TimeUnit;
-
 import static org.mockito.Mockito.atMost;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;