activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r1225554 - in /activemq/activemq-apollo/trunk/apollo-stomp/src/test: resources/log4j.properties scala/org/apache/activemq/apollo/stomp/StompClient.scala
Date Thu, 29 Dec 2011 15:10:18 GMT
Author: chirino
Date: Thu Dec 29 15:10:18 2011
New Revision: 1225554

URL: http://svn.apache.org/viewvc?rev=1225554&view=rev
Log:
Fixes linux test failure

Modified:
    activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/log4j.properties
    activemq/activemq-apollo/trunk/apollo-stomp/src/test/scala/org/apache/activemq/apollo/stomp/StompClient.scala

Modified: activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/log4j.properties?rev=1225554&r1=1225553&r2=1225554&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/log4j.properties (original)
+++ activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/log4j.properties Thu Dec
29 15:10:18 2011
@@ -38,7 +38,7 @@ log4j.appender.console.threshold=INFO
 
 # File Settings
 log4j.appender.logfile=org.apache.log4j.RollingFileAppender
-log4j.appender.logfile.file=${apollo.base}/log/apollo.log
+log4j.appender.logfile.file=apollo.log
 log4j.appender.logfile.maxFileSize=5MB
 log4j.appender.logfile.maxBackupIndex=5
 log4j.appender.logfile.append=true

Modified: activemq/activemq-apollo/trunk/apollo-stomp/src/test/scala/org/apache/activemq/apollo/stomp/StompClient.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-stomp/src/test/scala/org/apache/activemq/apollo/stomp/StompClient.scala?rev=1225554&r1=1225553&r2=1225554&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-stomp/src/test/scala/org/apache/activemq/apollo/stomp/StompClient.scala
(original)
+++ activemq/activemq-apollo/trunk/apollo-stomp/src/test/scala/org/apache/activemq/apollo/stomp/StompClient.scala
Thu Dec 29 15:10:18 2011
@@ -48,7 +48,7 @@ class StompClient extends ShouldMatchers
       new Socket
     }
     socket.connect(new InetSocketAddress(host, port))
-    socket.setSoLinger(true, 0)
+    socket.setSoLinger(true, 1)
     out = new BufferedOutputStream(socket.getOutputStream, bufferSize)
     in = new BufferedInputStream(socket.getInputStream, bufferSize)
   }



Mime
View raw message