camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r1102181 - in /camel/trunk/components/camel-smpp/src: main/java/org/apache/camel/component/smpp/ test/java/org/apache/camel/component/smpp/ test/java/org/apache/camel/component/smpp/integration/
Date Thu, 12 May 2011 06:56:08 GMT
Author: davsclaus
Date: Thu May 12 06:56:07 2011
New Revision: 1102181

URL: http://svn.apache.org/viewvc?rev=1102181&view=rev
Log:
CAMEL-3909: Fixed issue with using SMPP headers that could not be type casted to the type
to be used. Also fixed issue when disconnecting not setting session to null.

Modified:
    camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppBinding.java
    camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppComponent.java
    camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConfiguration.java
    camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConsumer.java
    camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppEndpoint.java
    camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppMessage.java
    camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppProducer.java
    camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppBindingTest.java
    camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppComponentTest.java
    camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppConfigurationTest.java
    camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppConsumerTest.java
    camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppEndpointTest.java
    camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppMessageTest.java
    camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerLazySessionCreationTest.java
    camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerTest.java
    camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppSSLConnectionFactoryTest.java
    camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/integration/SmppComponentIntegrationTest.java
    camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/integration/SmppComponentSpringIntegrationTest.java
    camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/integration/SmppConsumerReconnectIntegrationTest.java
    camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/integration/SmppProducerReconnectIntegrationTest.java

Modified: camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppBinding.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppBinding.java?rev=1102181&r1=1102180&r2=1102181&view=diff
==============================================================================
--- camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppBinding.java
(original)
+++ camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppBinding.java
Thu May 12 06:56:07 2011
@@ -39,7 +39,6 @@ import org.jsmpp.util.TimeFormatter;
  * {@link SmppMessage} to and from a SMPP {@link Command}
  * 
  * @version 
- * @author muellerc
  */
 public class SmppBinding {
 
@@ -96,81 +95,81 @@ public class SmppBinding {
         submitSm.setShortMessage(exchange.getIn().getBody(String.class).getBytes(configuration.getEncoding()));
 
         if (in.getHeaders().containsKey(DEST_ADDR)) {
-            submitSm.setDestAddress((String) in.getHeader(DEST_ADDR));
+            submitSm.setDestAddress(in.getHeader(DEST_ADDR, String.class));
         } else {
             submitSm.setDestAddress(configuration.getDestAddr());
         }
 
         if (in.getHeaders().containsKey(DEST_ADDR_TON)) {
-            submitSm.setDestAddrTon((Byte) in.getHeader(DEST_ADDR_TON));
+            submitSm.setDestAddrTon(in.getHeader(DEST_ADDR_TON, Byte.class));
         } else {
             submitSm.setDestAddrTon(configuration.getDestAddrTon());
         }
 
         if (in.getHeaders().containsKey(DEST_ADDR_NPI)) {
-            submitSm.setDestAddrNpi((Byte) in.getHeader(DEST_ADDR_NPI));
+            submitSm.setDestAddrNpi(in.getHeader(DEST_ADDR_NPI, Byte.class));
         } else {
             submitSm.setDestAddrNpi(configuration.getDestAddrNpi());
         }
 
         if (in.getHeaders().containsKey(SOURCE_ADDR)) {
-            submitSm.setSourceAddr((String) in.getHeader(SOURCE_ADDR));
+            submitSm.setSourceAddr(in.getHeader(SOURCE_ADDR, String.class));
         } else {
             submitSm.setSourceAddr(configuration.getSourceAddr());
         }
 
         if (in.getHeaders().containsKey(SOURCE_ADDR_TON)) {
-            submitSm.setSourceAddrTon((Byte) in.getHeader(SOURCE_ADDR_TON));
+            submitSm.setSourceAddrTon(in.getHeader(SOURCE_ADDR_TON, Byte.class));
         } else {
             submitSm.setSourceAddrTon(configuration.getSourceAddrTon());
         }
 
         if (in.getHeaders().containsKey(SOURCE_ADDR_NPI)) {
-            submitSm.setSourceAddrNpi((Byte) in.getHeader(SOURCE_ADDR_NPI));
+            submitSm.setSourceAddrNpi(in.getHeader(SOURCE_ADDR_NPI, Byte.class));
         } else {
             submitSm.setSourceAddrNpi(configuration.getSourceAddrNpi());
         }
 
         if (in.getHeaders().containsKey(SERVICE_TYPE)) {
-            submitSm.setServiceType((String) in.getHeader(SERVICE_TYPE));
+            submitSm.setServiceType(in.getHeader(SERVICE_TYPE, String.class));
         } else {
             submitSm.setServiceType(configuration.getServiceType());
         }
 
         if (in.getHeaders().containsKey(REGISTERED_DELIVERY)) {
-            submitSm.setRegisteredDelivery((Byte) in.getHeader(REGISTERED_DELIVERY));
+            submitSm.setRegisteredDelivery(in.getHeader(REGISTERED_DELIVERY, Byte.class));
         } else {
             submitSm.setRegisteredDelivery(configuration.getRegisteredDelivery());
         }
 
         if (in.getHeaders().containsKey(PROTOCOL_ID)) {
-            submitSm.setProtocolId((Byte) in.getHeader(PROTOCOL_ID));
+            submitSm.setProtocolId(in.getHeader(PROTOCOL_ID, Byte.class));
         } else {
             submitSm.setProtocolId(configuration.getProtocolId());
         }
 
         if (in.getHeaders().containsKey(PRIORITY_FLAG)) {
-            submitSm.setPriorityFlag((Byte) in.getHeader(PRIORITY_FLAG));
+            submitSm.setPriorityFlag(in.getHeader(PRIORITY_FLAG, Byte.class));
         } else {
             submitSm.setPriorityFlag(configuration.getPriorityFlag());
         }
 
         if (in.getHeaders().containsKey(SCHEDULE_DELIVERY_TIME)) {
-            submitSm.setScheduleDeliveryTime(timeFormatter.format((Date) in.getHeader(SCHEDULE_DELIVERY_TIME)));
+            submitSm.setScheduleDeliveryTime(timeFormatter.format(in.getHeader(SCHEDULE_DELIVERY_TIME,
Date.class)));
         } 
 
         if (in.getHeaders().containsKey(VALIDITY_PERIOD)) {
-            submitSm.setValidityPeriod(timeFormatter.format((Date) in.getHeader(VALIDITY_PERIOD)));
+            submitSm.setValidityPeriod(timeFormatter.format(in.getHeader(VALIDITY_PERIOD,
Date.class)));
         }
 
         if (in.getHeaders().containsKey(REPLACE_IF_PRESENT_FLAG)) {
-            submitSm.setReplaceIfPresent((Byte) in.getHeader(REPLACE_IF_PRESENT_FLAG));
+            submitSm.setReplaceIfPresent(in.getHeader(REPLACE_IF_PRESENT_FLAG, Byte.class));
         } else {
             submitSm.setReplaceIfPresent(configuration.getReplaceIfPresentFlag());
         }
         
         if (in.getHeaders().containsKey(DATA_CODING)) {
-            submitSm.setDataCoding((Byte) in.getHeader(DATA_CODING));
+            submitSm.setDataCoding(in.getHeader(DATA_CODING, Byte.class));
         } else {
             submitSm.setDataCoding(configuration.getDataCoding());
         }

Modified: camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppComponent.java?rev=1102181&r1=1102180&r2=1102181&view=diff
==============================================================================
--- camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppComponent.java
(original)
+++ camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppComponent.java
Thu May 12 06:56:07 2011
@@ -26,7 +26,6 @@ import org.apache.camel.util.Introspecti
 
 /**
  * @version 
- * @author muellerc
  */
 public class SmppComponent extends DefaultComponent {
 

Modified: camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConfiguration.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConfiguration.java?rev=1102181&r1=1102180&r2=1102181&view=diff
==============================================================================
--- camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConfiguration.java
(original)
+++ camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConfiguration.java
Thu May 12 06:56:07 2011
@@ -27,7 +27,6 @@ import org.jsmpp.bean.TypeOfNumber;
  * Contains the SMPP component configuration properties</a>
  * 
  * @version 
- * @author muellerc
  */
 public class SmppConfiguration implements Cloneable {
 

Modified: camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConsumer.java?rev=1102181&r1=1102180&r2=1102181&view=diff
==============================================================================
--- camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConsumer.java
(original)
+++ camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConsumer.java
Thu May 12 06:56:07 2011
@@ -50,7 +50,6 @@ import org.slf4j.LoggerFactory;
  * An implementation of @{link Consumer} which use the SMPP protocol
  * 
  * @version 
- * @author muellerc
  */
 public class SmppConsumer extends DefaultConsumer {
 
@@ -73,9 +72,9 @@ public class SmppConsumer extends Defaul
         this.sessionStateListener = new SessionStateListener() {
             public void onStateChange(SessionState newState, SessionState oldState, Object
source) {
                 if (newState.equals(SessionState.CLOSED)) {
-                    LOG.warn("Loost connection to: " + getEndpoint().getConnectionString()
+                    LOG.warn("Lost connection to: " + getEndpoint().getConnectionString()
                             + " - trying to reconnect...");
-                    closeSession(session);
+                    closeSession();
                     reconnect(configuration.getInitialReconnectDelay());
                 }
             }
@@ -185,12 +184,12 @@ public class SmppConsumer extends Defaul
         LOG.debug("Disconnecting from: " + getEndpoint().getConnectionString() + "...");
 
         super.doStop();
-        closeSession(session);
+        closeSession();
 
         LOG.info("Disconnected from: " + getEndpoint().getConnectionString());
     }
 
-    private void closeSession(SMPPSession session) {
+    private void closeSession() {
         if (session != null) {
             session.removeSessionStateListener(this.sessionStateListener);
             // remove this hack after http://code.google.com/p/jsmpp/issues/detail?id=93
is fixed
@@ -225,7 +224,7 @@ public class SmppConsumer extends Defaul
                                 reconnected = true;
                             } catch (IOException e) {
                                 LOG.info("Failed to reconnect to " + getEndpoint().getConnectionString());
-                                closeSession(session);
+                                closeSession();
                                 try {
                                     Thread.sleep(configuration.getReconnectDelay());
                                 } catch (InterruptedException ee) {

Modified: camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppEndpoint.java?rev=1102181&r1=1102180&r2=1102181&view=diff
==============================================================================
--- camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppEndpoint.java
(original)
+++ camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppEndpoint.java
Thu May 12 06:56:07 2011
@@ -31,7 +31,6 @@ import org.jsmpp.bean.DeliverSm;
  * A SMPP Endpoint
  * 
  * @version 
- * @author muellerc
  */
 public class SmppEndpoint extends DefaultEndpoint {
 

Modified: camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppMessage.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppMessage.java?rev=1102181&r1=1102180&r2=1102181&view=diff
==============================================================================
--- camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppMessage.java
(original)
+++ camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppMessage.java
Thu May 12 06:56:07 2011
@@ -29,7 +29,6 @@ import org.jsmpp.bean.MessageRequest;
  * Represents a {@link org.apache.camel.Message} for working with SMPP
  * 
  * @author muellerc
- * @version 
  */
 public class SmppMessage extends DefaultMessage {
 

Modified: camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppProducer.java?rev=1102181&r1=1102180&r2=1102181&view=diff
==============================================================================
--- camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppProducer.java
(original)
+++ camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppProducer.java
Thu May 12 06:56:07 2011
@@ -43,7 +43,6 @@ import org.slf4j.LoggerFactory;
 
 /**
  * An implementation of @{link Producer} which use the SMPP protocol
- * 
  */
 public class SmppProducer extends DefaultProducer {
 
@@ -60,8 +59,8 @@ public class SmppProducer extends Defaul
         this.sessionStateListener = new SessionStateListener() {
             public void onStateChange(SessionState newState, SessionState oldState, Object
source) {
                 if (newState.equals(SessionState.CLOSED)) {
-                    LOG.warn("Loosing connection to: " + getEndpoint().getConnectionString()
+ " - trying to reconnect...");
-                    closeSession(session);
+                    LOG.warn("Lost connection to: " + getEndpoint().getConnectionString()
+ " - trying to reconnect...");
+                    closeSession();
                     reconnect(configuration.getInitialReconnectDelay());
                 }
             }
@@ -194,12 +193,12 @@ public class SmppProducer extends Defaul
         LOG.debug("Disconnecting from: " + getEndpoint().getConnectionString() + "...");
 
         super.doStop();
-        closeSession(session);
+        closeSession();
 
         LOG.info("Disconnected from: " + getEndpoint().getConnectionString());
     }
     
-    private void closeSession(SMPPSession session) {
+    private void closeSession() {
         if (session != null) {
             session.removeSessionStateListener(this.sessionStateListener);
             // remove this hack after http://code.google.com/p/jsmpp/issues/detail?id=93
is fixed
@@ -234,7 +233,7 @@ public class SmppProducer extends Defaul
                                 reconnected = true;
                             } catch (IOException e) {
                                 LOG.info("Failed to reconnect to " + getEndpoint().getConnectionString());
-                                closeSession(session);
+                                closeSession();
                                 try {
                                     Thread.sleep(configuration.getReconnectDelay());
                                 } catch (InterruptedException ee) {

Modified: camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppBindingTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppBindingTest.java?rev=1102181&r1=1102180&r2=1102181&view=diff
==============================================================================
--- camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppBindingTest.java
(original)
+++ camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppBindingTest.java
Thu May 12 06:56:07 2011
@@ -44,7 +44,6 @@ import static org.junit.Assert.assertSam
  * JUnit test class for <code>org.apache.camel.component.smpp.SmppBinding</code>
  * 
  * @version 
- * @author muellerc
  */
 public class SmppBindingTest {
     

Modified: camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppComponentTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppComponentTest.java?rev=1102181&r1=1102180&r2=1102181&view=diff
==============================================================================
--- camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppComponentTest.java
(original)
+++ camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppComponentTest.java
Thu May 12 06:56:07 2011
@@ -36,7 +36,6 @@ import static org.junit.Assert.assertTru
  * JUnit test class for <code>org.apache.camel.component.smpp.SmppComponent</code>
  * 
  * @version 
- * @author muellerc
  */
 public class SmppComponentTest {
     

Modified: camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppConfigurationTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppConfigurationTest.java?rev=1102181&r1=1102180&r2=1102181&view=diff
==============================================================================
--- camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppConfigurationTest.java
(original)
+++ camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppConfigurationTest.java
Thu May 12 06:56:07 2011
@@ -31,7 +31,6 @@ import static org.junit.Assert.assertEqu
  * JUnit test class for <code>org.apache.camel.component.smpp.SmppConfiguration</code>
  * 
  * @version 
- * @author muellerc
  */
 public class SmppConfigurationTest {
     

Modified: camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppConsumerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppConsumerTest.java?rev=1102181&r1=1102180&r2=1102181&view=diff
==============================================================================
--- camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppConsumerTest.java
(original)
+++ camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppConsumerTest.java
Thu May 12 06:56:07 2011
@@ -34,7 +34,6 @@ import static org.junit.Assert.assertSam
  * JUnit test class for <code>org.apache.camel.component.smpp.SmppConsumer</code>
  * 
  * @version 
- * @author muellerc
  */
 public class SmppConsumerTest {
     

Modified: camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppEndpointTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppEndpointTest.java?rev=1102181&r1=1102180&r2=1102181&view=diff
==============================================================================
--- camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppEndpointTest.java
(original)
+++ camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppEndpointTest.java
Thu May 12 06:56:07 2011
@@ -43,7 +43,6 @@ import static org.junit.Assert.assertTru
  * JUnit test class for <code>org.apache.camel.component.smpp.SmppEndpoint</code>
  * 
  * @version 
- * @author muellerc
  */
 public class SmppEndpointTest {
     

Modified: camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppMessageTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppMessageTest.java?rev=1102181&r1=1102180&r2=1102181&view=diff
==============================================================================
--- camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppMessageTest.java
(original)
+++ camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppMessageTest.java
Thu May 12 06:56:07 2011
@@ -30,7 +30,6 @@ import static org.junit.Assert.assertTru
  * JUnit test class for <code>org.apache.camel.component.smpp.SmppMessage</code>
  * 
  * @version 
- * @author muellerc
  */
 public class SmppMessageTest {
     

Modified: camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerLazySessionCreationTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerLazySessionCreationTest.java?rev=1102181&r1=1102180&r2=1102181&view=diff
==============================================================================
--- camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerLazySessionCreationTest.java
(original)
+++ camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerLazySessionCreationTest.java
Thu May 12 06:56:07 2011
@@ -47,7 +47,6 @@ import static org.easymock.classextensio
  * JUnit test class for <code>org.apache.camel.component.smpp.SmppProducer</code>
  * 
  * @version 
- * @author muellerc
  */
 public class SmppProducerLazySessionCreationTest {
     

Modified: camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerTest.java?rev=1102181&r1=1102180&r2=1102181&view=diff
==============================================================================
--- camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerTest.java
(original)
+++ camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerTest.java
Thu May 12 06:56:07 2011
@@ -50,7 +50,6 @@ import static org.junit.Assert.assertSam
  * JUnit test class for <code>org.apache.camel.component.smpp.SmppProducer</code>
  * 
  * @version 
- * @author muellerc
  */
 public class SmppProducerTest {
     

Modified: camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppSSLConnectionFactoryTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppSSLConnectionFactoryTest.java?rev=1102181&r1=1102180&r2=1102181&view=diff
==============================================================================
--- camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppSSLConnectionFactoryTest.java
(original)
+++ camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppSSLConnectionFactoryTest.java
Thu May 12 06:56:07 2011
@@ -29,7 +29,6 @@ import static org.junit.Assert.*;
  * JUnit test class for <code>org.apache.camel.component.smpp.SmppSSLConnectionFactory</code>
  * 
  * @version 
- * @author cmueller
  */
 public class SmppSSLConnectionFactoryTest {
 
@@ -54,7 +53,9 @@ public class SmppSSLConnectionFactoryTes
             assertNotNull(connection);
             assertTrue(connection.isOpen());            
         } finally {
-            connection.close();
+            if (connection != null) {
+                connection.close();
+            }
         }
     }
 }
\ No newline at end of file

Modified: camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/integration/SmppComponentIntegrationTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/integration/SmppComponentIntegrationTest.java?rev=1102181&r1=1102180&r2=1102181&view=diff
==============================================================================
--- camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/integration/SmppComponentIntegrationTest.java
(original)
+++ camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/integration/SmppComponentIntegrationTest.java
Thu May 12 06:56:07 2011
@@ -38,7 +38,6 @@ import org.junit.Test;
  * A SMSC for test is available here: http://www.seleniumsoftware.com/downloads.html
  * 
  * @version 
- * @author muellerc
  */
 @Ignore("Must be manually tested")
 public class SmppComponentIntegrationTest extends CamelTestSupport {

Modified: camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/integration/SmppComponentSpringIntegrationTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/integration/SmppComponentSpringIntegrationTest.java?rev=1102181&r1=1102180&r2=1102181&view=diff
==============================================================================
--- camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/integration/SmppComponentSpringIntegrationTest.java
(original)
+++ camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/integration/SmppComponentSpringIntegrationTest.java
Thu May 12 06:56:07 2011
@@ -38,7 +38,6 @@ import org.springframework.context.suppo
  * A SMSC for test is available here: http://www.seleniumsoftware.com/downloads.html
  * 
  * @version 
- * @author muellerc
  */
 @Ignore("Must be manually tested")
 public class SmppComponentSpringIntegrationTest extends CamelSpringTestSupport {

Modified: camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/integration/SmppConsumerReconnectIntegrationTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/integration/SmppConsumerReconnectIntegrationTest.java?rev=1102181&r1=1102180&r2=1102181&view=diff
==============================================================================
--- camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/integration/SmppConsumerReconnectIntegrationTest.java
(original)
+++ camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/integration/SmppConsumerReconnectIntegrationTest.java
Thu May 12 06:56:07 2011
@@ -32,7 +32,6 @@ import org.junit.Test;
  * A SMSC for test is available here: http://www.seleniumsoftware.com/downloads.html
  * 
  * @version 
- * @author muellerc
  */
 @Ignore("Must be manually tested")
 public class SmppConsumerReconnectIntegrationTest extends CamelTestSupport {

Modified: camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/integration/SmppProducerReconnectIntegrationTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/integration/SmppProducerReconnectIntegrationTest.java?rev=1102181&r1=1102180&r2=1102181&view=diff
==============================================================================
--- camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/integration/SmppProducerReconnectIntegrationTest.java
(original)
+++ camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/integration/SmppProducerReconnectIntegrationTest.java
Thu May 12 06:56:07 2011
@@ -32,7 +32,6 @@ import org.junit.Test;
  * A SMSC for test is available here: http://www.seleniumsoftware.com/downloads.html
  * 
  * @version 
- * @author muellerc
  */
 @Ignore("Must be manually tested")
 public class SmppProducerReconnectIntegrationTest extends CamelTestSupport {



Mime
View raw message