3 files changed, 5 insertions, 7 deletions
diff --git a/java/demo/Database/library/LibraryI.java b/java/demo/Database/library/LibraryI.java
index 81bae5c6de7..9ec48815b36 100644
--- a/java/demo/Database/library/LibraryI.java
+++ b/java/demo/Database/library/LibraryI.java
@@ -90,7 +90,8 @@ class LibraryI extends _LibraryDisp
             }
 
             // Build a query that finds all books by these authors.
-            StringBuffer sb = new StringBuffer("(");
+            StringBuilder sb = new StringBuilder(128);
+            sb.append("(");
             boolean front = true;
             do
             {
diff --git a/java/demo/Database/library/Scanner.java b/java/demo/Database/library/Scanner.java
index 879396725b4..ecf325de077 100644
--- a/java/demo/Database/library/Scanner.java
+++ b/java/demo/Database/library/Scanner.java
@@ -151,7 +151,7 @@ class Scanner
             return null;
         }
 
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder(128);
 
         if(c == ';' || c == '\n')
         {
diff --git a/java/demo/Database/library/Server.java b/java/demo/Database/library/Server.java
index b2e66386ffa..4763f589010 100644
--- a/java/demo/Database/library/Server.java
+++ b/java/demo/Database/library/Server.java
@@ -9,7 +9,7 @@
 
 import Demo.*;
 
-class LibraryServer extends Ice.Application
+class Server extends Ice.Application
 {
     static class LocatorI implements Ice.ServantLocator
     {
@@ -129,14 +129,11 @@ class LibraryServer extends Ice.Application
 
         return 0;
     }
-}
 
-public class Server
-{
     static public void
     main(String[] args)
     {
-        LibraryServer app = new LibraryServer();
+        Server app = new Server();
         app.main("demo.Database.library.Server", args, "config.server");
     }
 }