[Lilith-devel] SF.net SVN: lilith:[310] trunk

[<hu...@us...>]

Revision: 310
          http://lilith.svn.sourceforge.net/lilith/?rev=310&view=rev
Author:   huxhorn
Date:     2009-08-12 21:50:33 +0000 (Wed, 12 Aug 2009)

Log Message:
-----------
Fixes ticket #64. Also fixes a rather stupid glitch I must have coded while being really tired...

Modified Paths:
--------------
    trunk/lilith/src/changes/changes.xml
    trunk/lilith/src/main/java/de/huxhorn/lilith/swing/callables/FilteringCallable.java
    trunk/logback/multiplex-appender-core/src/main/java/de/huxhorn/lilith/logback/appender/MultiplexSocketAppenderBase.java

Modified: trunk/lilith/src/changes/changes.xml
===================================================================
--- trunk/lilith/src/changes/changes.xml	2009-08-12 21:26:41 UTC (rev 309)
+++ trunk/lilith/src/changes/changes.xml	2009-08-12 21:50:33 UTC (rev 310)
@@ -86,6 +86,18 @@
 		</release>
 
 		<release version="0.9.37" date="TBD" description="Future release">
+			<action dev="jhux" type="fix" issue="64">
+				Events did sometimes show up twice in filtered views. This was caused by a classic off-by-one error.
+			</action>
+			<action dev="jhux" type="fix">
+				Fixed a remaining hang in the multiplex appenders in case of certain network problems.
+			</action>
+			<action dev="jhux" type="update">
+				Updated Groovy to 1.6.4.
+			</action>
+			<action dev="jhux" type="update" issue="63">
+				Updated Logback to 0.9.17. This fixes issue 63 that was caused by a Logback bug. Thanks for the fast fix, Ceki!
+			</action>
 		</release>
 
 		<release version="0.9.36" date="2009-07-20" description="Release">

Modified: trunk/lilith/src/main/java/de/huxhorn/lilith/swing/callables/FilteringCallable.java
===================================================================
--- trunk/lilith/src/main/java/de/huxhorn/lilith/swing/callables/FilteringCallable.java	2009-08-12 21:26:41 UTC (rev 309)
+++ trunk/lilith/src/main/java/de/huxhorn/lilith/swing/callables/FilteringCallable.java	2009-08-12 21:50:33 UTC (rev 310)
@@ -31,7 +31,7 @@
 	private final Logger logger = LoggerFactory.getLogger(FilteringCallable.class);
 
 	private int filterDelay;
-	private long lastFilteredElement;
+	private long lastFilteredElement = -1;
 	private FilteringBuffer<E> filteringBuffer;
 
 
@@ -59,17 +59,18 @@
 				break;
 			}
 			long currentSize = sourceBuffer.getSize();
-			long filterStartIndex = lastFilteredElement;
-			if(currentSize < lastFilteredElement)
+			long filterStartIndex = lastFilteredElement + 1;
+			if(filterStartIndex > currentSize)
 			{
 				filterStartIndex = 0;
+				lastFilteredElement = -1;
 				filteringBuffer.clearFilteredIndices();
 			}
 
 			setNumberOfSteps(currentSize);
 			setCurrentStep(filterStartIndex);
 
-			if(currentSize != lastFilteredElement + 1)
+			if(currentSize != filterStartIndex)
 			{
 				for(long i = filterStartIndex; i < currentSize; i++)
 				{

Modified: trunk/logback/multiplex-appender-core/src/main/java/de/huxhorn/lilith/logback/appender/MultiplexSocketAppenderBase.java
===================================================================
--- trunk/logback/multiplex-appender-core/src/main/java/de/huxhorn/lilith/logback/appender/MultiplexSocketAppenderBase.java	2009-08-12 21:26:41 UTC (rev 309)
+++ trunk/logback/multiplex-appender-core/src/main/java/de/huxhorn/lilith/logback/appender/MultiplexSocketAppenderBase.java	2009-08-12 21:50:33 UTC (rev 310)
@@ -191,7 +191,7 @@
 			addInfo("Waiting 1s to establish connections.");
 			try
 			{
-				Thread.currentThread().wait(1000);
+				Thread.sleep(1000);
 			}
 			catch(InterruptedException e)
 			{


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.