From 5a6735d392010cda5bb05e841e5a508865ea9ad9 Mon Sep 17 00:00:00 2001 From: Carlos Herrera Date: Sun, 2 Jun 2013 22:35:19 -0700 Subject: [PATCH 1/2] Fix NullPointerException while processing OptionalParameters --- .../java/org/jsmpp/bean/OptionalParameters.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/jsmpp/src/main/java/org/jsmpp/bean/OptionalParameters.java b/jsmpp/src/main/java/org/jsmpp/bean/OptionalParameters.java index b5f032f..4a91cbf 100644 --- a/jsmpp/src/main/java/org/jsmpp/bean/OptionalParameters.java +++ b/jsmpp/src/main/java/org/jsmpp/bean/OptionalParameters.java @@ -235,9 +235,11 @@ public static OptionalParameter deserialize(short tagCode, byte[] content) { @SuppressWarnings("unchecked") public static U get(Class tagClass, OptionalParameter[] parameters) { - for(OptionalParameter i: parameters) { - if(i.getClass() == tagClass) { - return (U)i; + if (parameters != null) { + for(OptionalParameter i: parameters) { + if(i.getClass() == tagClass) { + return (U)i; + } } } logger.info("optional tag " + tagClass + " not found"); @@ -246,9 +248,11 @@ public static U get(Class tagClass, OptionalPar public static OptionalParameter get(short tag, OptionalParameter[] parameters) { - for(OptionalParameter i: parameters) { - if(i.tag == tag) { - return i; + if (parameters != null) { + for(OptionalParameter i: parameters) { + if(i.tag == tag) { + return i; + } } } logger.info("optional tag " + tag + " not found"); From e55ad82c5291253a47d7f43a1c76191f709dc841 Mon Sep 17 00:00:00 2001 From: Carlos Herrera Date: Tue, 23 Jun 2015 23:08:09 -0700 Subject: [PATCH 2/2] Fixed failing Time Formatter unit tests. --- .../main/java/org/jsmpp/util/RelativeTimeFormatter.java | 2 +- jsmpp/src/test/java/org/jsmpp/util/DateFormatterTest.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/jsmpp/src/main/java/org/jsmpp/util/RelativeTimeFormatter.java b/jsmpp/src/main/java/org/jsmpp/util/RelativeTimeFormatter.java index c7e35e0..f8e6610 100644 --- a/jsmpp/src/main/java/org/jsmpp/util/RelativeTimeFormatter.java +++ b/jsmpp/src/main/java/org/jsmpp/util/RelativeTimeFormatter.java @@ -61,7 +61,7 @@ public String format(Calendar calendar) { - calendar.getTimeZone().getOffset(calendar.getTimeInMillis()) + timezone.getOffset(calendar.getTimeInMillis()); - Calendar cal = Calendar.getInstance(); + Calendar cal = Calendar.getInstance(calendar.getTimeZone()); cal.setTimeInMillis(relativeTime); int year = cal.get(Calendar.YEAR) - 2000; int month = cal.get(Calendar.MONTH) + 1; diff --git a/jsmpp/src/test/java/org/jsmpp/util/DateFormatterTest.java b/jsmpp/src/test/java/org/jsmpp/util/DateFormatterTest.java index 28440d0..3ad7e8f 100644 --- a/jsmpp/src/test/java/org/jsmpp/util/DateFormatterTest.java +++ b/jsmpp/src/test/java/org/jsmpp/util/DateFormatterTest.java @@ -74,11 +74,11 @@ public void validateRelativeDate() throws Exception { public void formatAbsoluteDate() { TimeFormatter timeFormatter = new AbsoluteTimeFormatter(); - GregorianCalendar date = new GregorianCalendar(Locale.GERMANY); + GregorianCalendar date = new GregorianCalendar(TimeZone.getTimeZone("Europe/Berlin"), Locale.GERMANY); date.set(Calendar.YEAR, 2013); date.set(Calendar.MONTH, Calendar.JANUARY); date.set(Calendar.DAY_OF_MONTH, 1); - date.set(Calendar.HOUR, 1); + date.set(Calendar.HOUR_OF_DAY, 13); date.set(Calendar.MINUTE, 0); date.set(Calendar.SECOND, 0); date.set(Calendar.MILLISECOND, 0); @@ -96,11 +96,11 @@ public void formatRelativeDate() { RelativeTimeFormatter timeFormatter = new RelativeTimeFormatter(TimeZone.getTimeZone("America/Denver")); // at this date neither Denver nor Germany has daylight saving time - GregorianCalendar date = new GregorianCalendar(Locale.GERMANY); + GregorianCalendar date = new GregorianCalendar(TimeZone.getTimeZone("Europe/Berlin"), Locale.GERMANY); date.set(Calendar.YEAR, 2013); date.set(Calendar.MONTH, Calendar.JANUARY); date.set(Calendar.DAY_OF_MONTH, 1); - date.set(Calendar.HOUR, 1); + date.set(Calendar.HOUR_OF_DAY, 13); date.set(Calendar.MINUTE, 0); date.set(Calendar.SECOND, 0); date.set(Calendar.MILLISECOND, 0);