| commit | a93ba3c6bcd9593636d844e5af62e658d7c46727 | [log] [tgz] |
|---|---|---|
| author | Sam Davis <sam.davis@tasktop.com> | Mon Oct 19 15:26:50 2015 -0700 |
| committer | Sam Davis <sam.davis@tasktop.com> | Mon Oct 19 15:27:26 2015 -0700 |
| tree | 941f045a86b3562785c4bf6ae7f5ed4febbbdb95 | |
| parent | 63549ef54a613416f442bc774965289f429f8b77 [diff] |
480168: NullPointerException below NotificationsPreferencesPage.applyData (338) Change-Id: I6b6be32d9a7cfb09d65316ce7fa8bde2b6ad9240 Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=480168
diff --git a/org.eclipse.mylyn.commons.core/src/org/eclipse/mylyn/commons/core/CoreUtil.java b/org.eclipse.mylyn.commons.core/src/org/eclipse/mylyn/commons/core/CoreUtil.java index e59d9cb..22fba27 100644 --- a/org.eclipse.mylyn.commons.core/src/org/eclipse/mylyn/commons/core/CoreUtil.java +++ b/org.eclipse.mylyn.commons.core/src/org/eclipse/mylyn/commons/core/CoreUtil.java
@@ -46,7 +46,7 @@ } } - private static final String FRAMEWORK_VERSION = "3.17.0"; //$NON-NLS-1$ + private static final String FRAMEWORK_VERSION = "3.18.0"; //$NON-NLS-1$ private static final SAXParserFactory saxParserFactory = SAXParserFactory.newInstance(); static {
diff --git a/org.eclipse.mylyn.commons.notifications.ui/src/org/eclipse/mylyn/internal/commons/notifications/ui/NotificationsPreferencesPage.java b/org.eclipse.mylyn.commons.notifications.ui/src/org/eclipse/mylyn/internal/commons/notifications/ui/NotificationsPreferencesPage.java index 40053bd..fb50c05 100644 --- a/org.eclipse.mylyn.commons.notifications.ui/src/org/eclipse/mylyn/internal/commons/notifications/ui/NotificationsPreferencesPage.java +++ b/org.eclipse.mylyn.commons.notifications.ui/src/org/eclipse/mylyn/internal/commons/notifications/ui/NotificationsPreferencesPage.java
@@ -333,7 +333,7 @@ // We may or may not have a NotificationEvent supplied when this // preference dialog is opened. If we do have this data we want to // highlight the appropriate instance. - if (data instanceof String) { + if (data instanceof String && model != null) { String selectedEventId = (String) data; Collection<NotificationCategory> items = model.getCategories(); NotificationEvent selectedEvent = null;