Skip to content

A few fixes #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
chscorpio wants to merge 3 commits into
base: master
Choose a base branch
from
Open

A few fixes #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5a6735d
Fix NullPointerException while processing OptionalParameters
chscorpio Jun 3, 2013
b439586
Merge pull request #1 from uudashr/master
chscorpio Jun 17, 2015
e55ad82
Fixed failing Time Formatter unit tests.
chscorpio Jun 24, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions jsmpp/src/main/java/org/jsmpp/bean/OptionalParameters.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,9 +235,11 @@ public static OptionalParameter deserialize(short tagCode, byte[] content) {
@SuppressWarnings("unchecked")
public static <U extends OptionalParameter> U get(Class<U> 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");
Expand All @@ -246,9 +248,11 @@ public static <U extends OptionalParameter> U get(Class<U> 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");
Expand Down
2 changes: 1 addition & 1 deletion jsmpp/src/main/java/org/jsmpp/util/RelativeTimeFormatter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions jsmpp/src/test/java/org/jsmpp/util/DateFormatterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand Down