--- old/src/java.base/share/classes/sun/util/locale/provider/CalendarDataProviderImpl.java	2017-11-10 15:30:28.777524710 -0800
+++ new/src/java.base/share/classes/sun/util/locale/provider/CalendarDataProviderImpl.java	2017-11-10 15:30:28.441518429 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -46,14 +46,16 @@
 
     @Override
     public int getFirstDayOfWeek(Locale locale) {
-        return LocaleProviderAdapter.forType(type).getLocaleResources(locale)
+        String fw = LocaleProviderAdapter.forType(type).getLocaleResources(locale)
                    .getCalendarData(CalendarDataUtility.FIRST_DAY_OF_WEEK);
+        return fw.isEmpty() ? 0 : Integer.parseInt(fw);
     }
 
     @Override
     public int getMinimalDaysInFirstWeek(Locale locale) {
-        return LocaleProviderAdapter.forType(type).getLocaleResources(locale)
+        String md = LocaleProviderAdapter.forType(type).getLocaleResources(locale)
                    .getCalendarData(CalendarDataUtility.MINIMAL_DAYS_IN_FIRST_WEEK);
+        return md.isEmpty() ? 0 : Integer.parseInt(md);
     }
 
     @Override