From f2740d55e0f76c647fb4a32c596a8f105266931c Mon Sep 17 00:00:00 2001 From: Mihaela Rosca Date: Fri, 15 May 2015 18:07:11 +0200 Subject: [PATCH 1/2] fix the return in the finally block --- .../src/com/google/i18n/phonenumbers/PhoneNumberUtil.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java b/java/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java index 173461c1a..4bb8f2ed3 100644 --- a/java/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java +++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java @@ -664,10 +664,9 @@ public class PhoneNumberUtil { source.close(); } catch (IOException e) { logger.log(Level.WARNING, "error closing input stream (ignored)", e); - } finally { - return metadataCollection; } } + return metadataCollection; } /** From 5dee6a4d61e904bdbb4b9a97a0c6a16addbabd3d Mon Sep 17 00:00:00 2001 From: Mihaela Rosca Date: Fri, 15 May 2015 18:07:11 +0200 Subject: [PATCH 2/2] Fix the return in the finally block in PhoneNumberUtil.java --- .../src/com/google/i18n/phonenumbers/PhoneNumberUtil.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java b/java/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java index 173461c1a..4bb8f2ed3 100644 --- a/java/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java +++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java @@ -664,10 +664,9 @@ public class PhoneNumberUtil { source.close(); } catch (IOException e) { logger.log(Level.WARNING, "error closing input stream (ignored)", e); - } finally { - return metadataCollection; } } + return metadataCollection; } /**