4 files changed, 27 insertions, 23 deletions
diff --git a/java/ant/SliceTask$SliceDependency.class b/java/ant/SliceTask$SliceDependency.class
index 466d28f2cc1..2a5afd9450f 100644
--- a/java/ant/SliceTask$SliceDependency.class
+++ b/java/ant/SliceTask$SliceDependency.class
diff --git a/java/ant/SliceTask.class b/java/ant/SliceTask.class
index 1c345740b79..df08e434030 100644
--- a/java/ant/SliceTask.class
+++ b/java/ant/SliceTask.class
diff --git a/java/ant/SliceTask.java b/java/ant/SliceTask.java
index 6b401acbed0..69e827b4b8c 100644
--- a/java/ant/SliceTask.java
+++ b/java/ant/SliceTask.java
@@ -217,7 +217,11 @@ public class SliceTask extends org.apache.tools.ant.Task
 
             while((line = in.readLine()) != null)
             {
-                if(line.endsWith("\\"))
+                if(line.length() == 0)
+                {
+                    continue;
+                }
+                else if(line.endsWith("\\"))
                 {
                     depline.append(line.substring(0, line.length() - 1));
                 }
diff --git a/java/demo/Ice/bidir/Callback.ice b/java/demo/Ice/bidir/Callback.ice
index f5b8652197a..59ddf67b916 100755
--- a/java/demo/Ice/bidir/Callback.ice
+++ b/java/demo/Ice/bidir/Callback.ice
@@ -6,25 +6,25 @@
 // ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
-
-#ifndef CALLBACK_ICE
-#define CALLBACK_ICE
-
-#include <Ice/Identity.ice>
-
-module Demo
-{
-
-interface CallbackReceiver
-{
-    void callback(int num);
-};
-
-interface CallbackSender
-{
-    void addClient(Ice::Identity ident);
-};
-
-};
-
-#endif
+
+#ifndef CALLBACK_ICE
+#define CALLBACK_ICE
+
+#include <Ice/Identity.ice>
+
+module Demo
+{
+
+interface CallbackReceiver
+{
+    void callback(int num);
+};
+
+interface CallbackSender
+{
+    void addClient(Ice::Identity ident);
+};
+
+};
+
+#endif