diff options
| author | Thomas Watson | 2010-04-30 16:06:17 +0000 |
|---|---|---|
| committer | Thomas Watson | 2010-04-30 16:06:17 +0000 |
| commit | f25751db06a557e0c16a5165044f69166a017226 (patch) | |
| tree | 176f8c1858e0f47bd252256956b9279a670ca42b /bundles/org.eclipse.osgi | |
| parent | 816211fa46452a3f11e0b544230a7d63435779f5 (diff) | |
| download | rt.equinox.framework-f25751db06a557e0c16a5165044f69166a017226.tar.gz rt.equinox.framework-f25751db06a557e0c16a5165044f69166a017226.tar.xz rt.equinox.framework-f25751db06a557e0c16a5165044f69166a017226.zip | |
Bug 311027 - [console] NPE in console view when using -s option
Diffstat (limited to 'bundles/org.eclipse.osgi')
| -rw-r--r-- | bundles/org.eclipse.osgi/console/src/org/eclipse/osgi/framework/internal/core/FrameworkCommandProvider.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/bundles/org.eclipse.osgi/console/src/org/eclipse/osgi/framework/internal/core/FrameworkCommandProvider.java b/bundles/org.eclipse.osgi/console/src/org/eclipse/osgi/framework/internal/core/FrameworkCommandProvider.java index e2f36de7b..da34820de 100644 --- a/bundles/org.eclipse.osgi/console/src/org/eclipse/osgi/framework/internal/core/FrameworkCommandProvider.java +++ b/bundles/org.eclipse.osgi/console/src/org/eclipse/osgi/framework/internal/core/FrameworkCommandProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2009 IBM Corporation and others. + * Copyright (c) 2003, 2010 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -430,6 +430,8 @@ public class FrameworkCommandProvider implements CommandProvider, SynchronousBun int stateFilter = -1; if (option != null && option.equals("-s")) { //$NON-NLS-1$ String searchedState = intp.nextArgument(); + if (searchedState == null) + searchedState = ""; //$NON-NLS-1$ StringTokenizer tokens = new StringTokenizer(searchedState, ","); //$NON-NLS-1$ while (tokens.hasMoreElements()) { String desiredState = (String) tokens.nextElement(); |