diff options
| author | Wainer dos Santos Moschetta | 2015-06-09 16:54:03 +0000 |
|---|---|---|
| committer | Wainer dos Santos Moschetta | 2015-06-09 23:31:59 +0000 |
| commit | 3b367c9232ddda03a219caeba772ce01c7e0ec95 (patch) | |
| tree | 049493f2f4ef4056d65e9b0a35914ac34147a369 | |
| parent | f47fc595c488aabf1a5dee74717b3c3b1d81d11f (diff) | |
| download | org.eclipse.ptp-3b367c9232ddda03a219caeba772ce01c7e0ec95.tar.gz org.eclipse.ptp-3b367c9232ddda03a219caeba772ce01c7e0ec95.tar.xz org.eclipse.ptp-3b367c9232ddda03a219caeba772ce01c7e0ec95.zip | |
SyncManager throws NPE if sync service Id was invalid.
Change-Id: I8e486014c1219caab9d01e79afd645984e4f5f5d
Signed-off-by: Wainer dos Santos Moschetta <wainersm@linux.vnet.ibm.com>
| -rw-r--r-- | rdt/org.eclipse.ptp.rdt.sync.core/src/org/eclipse/ptp/rdt/sync/core/SyncManager.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/rdt/org.eclipse.ptp.rdt.sync.core/src/org/eclipse/ptp/rdt/sync/core/SyncManager.java b/rdt/org.eclipse.ptp.rdt.sync.core/src/org/eclipse/ptp/rdt/sync/core/SyncManager.java index 6025b1c46..59d7f5777 100644 --- a/rdt/org.eclipse.ptp.rdt.sync.core/src/org/eclipse/ptp/rdt/sync/core/SyncManager.java +++ b/rdt/org.eclipse.ptp.rdt.sync.core/src/org/eclipse/ptp/rdt/sync/core/SyncManager.java @@ -36,6 +36,7 @@ import org.eclipse.ptp.rdt.sync.core.handlers.ISyncExceptionHandler; import org.eclipse.ptp.rdt.sync.core.listeners.ISyncListener; import org.eclipse.ptp.rdt.sync.core.resources.RemoteSyncNature; import org.eclipse.ptp.rdt.sync.core.services.ISynchronizeService; +import org.eclipse.ptp.rdt.sync.core.services.ISynchronizeServiceDescriptor; import org.eclipse.remote.core.IRemoteConnection; import org.eclipse.remote.core.IRemoteConnectionType; import org.osgi.service.prefs.Preferences; @@ -302,7 +303,11 @@ public class SyncManager { * @since 4.0 */ public static ISynchronizeService getSyncService(String syncServiceId) { - return SynchronizeServiceRegistry.getSynchronizeServiceDescriptor(syncServiceId).getService(); + ISynchronizeServiceDescriptor desc = SynchronizeServiceRegistry.getSynchronizeServiceDescriptor(syncServiceId); + if(desc == null) { + return null; + } + return desc.getService(); } private static void notifySyncListeners(IProject project) { |