Fixed minor bugs in IceUtil.Options.split() and added inputUtil tests.

1 files changed, 8 insertions, 0 deletions

diff --git a/java/src/IceUtil/Options.java b/java/src/IceUtil/Options.java
index 7db0c20ed8d..65184b68592 100644
--- a/java/src/IceUtil/Options.java
+++ b/java/src/IceUtil/Options.java
@@ -30,6 +30,10 @@ public final class Options
 	final int ANSIQuoteState = 4;
 
 	line = line.trim();
+	if(line.length() == 0)
+	{
+	    return new String[0];
+	}
 
 	int state = NormalState;
 
@@ -381,6 +385,10 @@ public final class Options
 	{
 	    throw new BadQuote("missing closing double quote");
 	}
+	case ANSIQuoteState:
+	{
+	    throw new BadQuote("unterminated $' quote");
+	}
 	default:
 	{
 	    assert(false);