property fixes; minor cleanup

5 files changed, 30 insertions, 50 deletions

diff --git a/java/demo/Freeze/phonebook/Collocated.java b/java/demo/Freeze/phonebook/Collocated.java
index 337f2321ea2..9ee0626b4de 100644
--- a/java/demo/Freeze/phonebook/Collocated.java
+++ b/java/demo/Freeze/phonebook/Collocated.java
@@ -27,19 +27,15 @@ class PhoneBookCollocated extends Freeze.Application
 	// Create an Evictor for contacts.
 	//
 	Freeze.Evictor evictor;
-	String value = properties.getProperty("PhoneBook.SaveAfterMutatingOperation");
 	int v = 0;
-	if (value != null)
-	{
-	    try
-	    {
-		v = Integer.parseInt(value);
-	    }
-	    catch (NumberFormatException ex)
-	    {
-	    }
-	}
-	
+        try
+        {
+            v = Integer.parseInt(properties.getProperty("PhoneBook.SaveAfterMutatingOperation"));
+        }
+        catch (NumberFormatException ex)
+        {
+        }
+
 	if(v != 0)
 	{
 	    evictor = dbContacts.createEvictor(Freeze.EvictorPersistenceMode.SaveAfterMutatingOperation);
@@ -49,17 +45,13 @@ class PhoneBookCollocated extends Freeze.Application
 	    evictor = dbContacts.createEvictor(Freeze.EvictorPersistenceMode.SaveUponEviction);
 	}
 
-	value = properties.getProperty("PhoneBook.EvictorSize");
-	if (value != null)
-	{
-	    try
-	    {
-		v = Integer.parseInt(value);
-	    }
-	    catch (NumberFormatException ex)
-	    {
-	    }
-	}
+        try
+        {
+            v = Integer.parseInt(properties.getProperty("PhoneBook.EvictorSize"));
+        }
+        catch (NumberFormatException ex)
+        {
+        }
 
 	if(v != 0)
 	{
diff --git a/java/demo/Freeze/phonebook/Parser.java b/java/demo/Freeze/phonebook/Parser.java
index 7ad33e680a1..bdf3f24c905 100644
--- a/java/demo/Freeze/phonebook/Parser.java
+++ b/java/demo/Freeze/phonebook/Parser.java
@@ -10,7 +10,6 @@
 
 class Parser
 {
-
     public
     Parser(Ice.Communicator communicator, PhoneBookPrx phoneBook)
     {
@@ -42,7 +41,7 @@ class Parser
     {
 	if (args.isEmpty())
 	{
-	    error("`add' requires at least one rgument (type `help' for more info)");
+	    error("`add' requires at least one argument (type `help' for more info)");
 	    return;
 	}
 	
@@ -331,5 +330,4 @@ class Parser
     private PhoneBookPrx _phoneBook;
 
     private java.io.BufferedReader _in;
-
 }
diff --git a/java/demo/Freeze/phonebook/RunParser.java b/java/demo/Freeze/phonebook/RunParser.java
index d006eeb0789..80b4842fb81 100644
--- a/java/demo/Freeze/phonebook/RunParser.java
+++ b/java/demo/Freeze/phonebook/RunParser.java
@@ -56,7 +56,7 @@ class RunParser
 	Ice.Properties properties = communicator.getProperties();
 	String refProperty = "PhoneBook.PhoneBook";
 	String ref = properties.getProperty(refProperty);
-	if (ref == null)
+	if (ref.length() == 0)
 	{
 	    System.err.println(appName +  ": property `" + refProperty + "' not set");
 	    return 1;
diff --git a/java/demo/Freeze/phonebook/Scanner.java b/java/demo/Freeze/phonebook/Scanner.java
index fc3efd9643b..dff7d5bfd3b 100644
--- a/java/demo/Freeze/phonebook/Scanner.java
+++ b/java/demo/Freeze/phonebook/Scanner.java
@@ -286,4 +286,3 @@ class Scanner
     private String _buf = null;
     private int _pos;
 }
-
diff --git a/java/demo/Freeze/phonebook/Server.java b/java/demo/Freeze/phonebook/Server.java
index 98c6b891b9f..06bd41783df 100644
--- a/java/demo/Freeze/phonebook/Server.java
+++ b/java/demo/Freeze/phonebook/Server.java
@@ -27,19 +27,14 @@ class PhoneBookServer extends Freeze.Application
 	// Create an Evictor for contacts.
 	//
 	Freeze.Evictor evictor;
-	String value = properties.getProperty("PhoneBook.SaveAfterMutatingOperation");
 	int v = 0;
-	if (value != null)
-	{
-	    try
-	    {
-		v = Integer.parseInt(value);
-	    }
-	    catch (NumberFormatException ex)
-	    {
-	    }
+        try
+        {
+            v = Integer.parseInt(properties.getProperty("PhoneBook.SaveAfterMutatingOperation"));
+        }
+        catch (NumberFormatException ex)
+        {
 	}
-	
 
 	if(v != 0)
 	{
@@ -50,17 +45,13 @@ class PhoneBookServer extends Freeze.Application
 	    evictor = dbContacts.createEvictor(Freeze.EvictorPersistenceMode.SaveUponEviction);
 	}
 
-	value = properties.getProperty("PhoneBook.EvictorSize");
-	if (value != null)
-	{
-	    try
-	    {
-		v = Integer.parseInt(value);
-	    }
-	    catch (NumberFormatException ex)
-	    {
-	    }
-	}
+        try
+        {
+            v = Integer.parseInt(properties.getProperty("PhoneBook.EvictorSize"));
+        }
+        catch (NumberFormatException ex)
+        {
+        }
 
 	if(v != 0)
 	{