From fba9a7e32be3a80df36fe7b3f6ee839b68f35d2e Mon Sep 17 00:00:00 2001
From: Narayan Kamath <narayan@google.com>
Date: Fri, 5 Sep 2014 10:38:01 +0100
Subject: DecimalFormatSymbols with a null locale should throw.

We left this out when manually auditing the list of classes
that don't throw and silently use the default (like Calendar)
vs those that do. See bugs 16938922 and 15849709.

bug: 17394277

Change-Id: I6e1dae3c9251dfd48221914351a504f24f4bdf5d
---
 luni/src/main/java/java/text/DecimalFormatSymbols.java | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'luni')

diff --git a/luni/src/main/java/java/text/DecimalFormatSymbols.java b/luni/src/main/java/java/text/DecimalFormatSymbols.java
index 6e25c1b..fba2d6e 100644
--- a/luni/src/main/java/java/text/DecimalFormatSymbols.java
+++ b/luni/src/main/java/java/text/DecimalFormatSymbols.java
@@ -81,6 +81,10 @@ public class DecimalFormatSymbols implements Cloneable, Serializable {
      *            the locale.
      */
     public DecimalFormatSymbols(Locale locale) {
+        if (locale == null) {
+            throw new NullPointerException("locale == null");
+        }
+
         locale = LocaleData.mapInvalidAndNullLocales(locale);
         LocaleData localeData = LocaleData.get(locale);
         this.zeroDigit = localeData.zeroDigit;
-- 
cgit v1.1