From 3d1c8788547414de4fefbec44a1c014b77781fcf Mon Sep 17 00:00:00 2001
From: Bryce McKinlay <bryce@albatross.co.nz>
Date: Mon, 19 Feb 2001 03:43:12 +0000
Subject: Integer.java (getInteger): Return default argument if property is not
 set.

	* java/lang/Integer.java (getInteger): Return default argument if
	property is not set. Don't call decode with null argument.
	* java/lang/Long.java (getLong): Likewise.

From-SVN: r39870
---
 libjava/java/lang/Integer.java | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'libjava/java/lang/Integer.java')

diff --git a/libjava/java/lang/Integer.java b/libjava/java/lang/Integer.java
index 2cf7bb45349..88d0769a275 100644
--- a/libjava/java/lang/Integer.java
+++ b/libjava/java/lang/Integer.java
@@ -155,13 +155,15 @@ public final class Integer extends Number implements Comparable
   public static Integer getInteger(String prop, Integer defobj)
   {
     try
-    {
-      return decode(System.getProperty(prop));
-    }
+      {
+        String val = System.getProperty(prop);
+	if (val != null)
+	  return decode(val);
+      }
     catch (NumberFormatException ex)
-    {
-      return defobj;
-    }
+      {
+      }
+    return defobj;
   }
 
   public int hashCode()
-- 
cgit v1.2.1