[jbosstools-commits] JBoss Tools SVN: r40045 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal.
Author: rob.stryker(a)jboss.com
Date: 2012-04-04 22:49:10 -0400 (Wed, 04 Apr 2012)
New Revision: 40045
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ExtendedServerPropertiesAdapterFactory.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/IExtendedPropertiesProvider.java
Log:
JBIDE-11478 npe on tomcat server
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ExtendedServerPropertiesAdapterFactory.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ExtendedServerPropertiesAdapterFactory.java 2012-04-05
00:36:53 UTC (rev 40044)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ExtendedServerPropertiesAdapterFactory.java 2012-04-05
02:49:10 UTC (rev 40045)
@@ -18,6 +18,7 @@
import org.eclipse.wst.server.core.IServerAttributes;
import
org.jboss.ide.eclipse.as.core.server.internal.extendedproperties.JBossAS710ExtendedProperties;
import
org.jboss.ide.eclipse.as.core.server.internal.extendedproperties.JBossAS7ExtendedProperties;
+import
org.jboss.ide.eclipse.as.core.server.internal.extendedproperties.JBossEAP60ExtendedProperties;
import
org.jboss.ide.eclipse.as.core.server.internal.extendedproperties.JBossExtendedProperties;
import
org.jboss.ide.eclipse.as.core.server.internal.extendedproperties.ServerExtendedProperties;
import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
@@ -36,7 +37,7 @@
public Object getAdapter(Object adaptableObject, Class adapterType) {
ServerExtendedProperties props = getExtendedProperties(adaptableObject);
- if( adapterType.isAssignableFrom(props.getClass()))
+ if( props != null && adapterType.isAssignableFrom(props.getClass()))
return props;
return null;
}
@@ -76,7 +77,7 @@
if( SERVER_AS_71.equals(typeId) || AS_71.equals(typeId))
return new JBossAS710ExtendedProperties(adaptable);
if( SERVER_EAP_60.equals(typeId) || EAP_60.equals(typeId))
- return new JBossAS710ExtendedProperties(adaptable);
+ return new JBossEAP60ExtendedProperties(adaptable);
// NEW_SERVER_ADAPTER
}
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/IExtendedPropertiesProvider.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/IExtendedPropertiesProvider.java 2012-04-05
00:36:53 UTC (rev 40044)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/IExtendedPropertiesProvider.java 2012-04-05
02:49:10 UTC (rev 40045)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.ide.eclipse.as.core.server.internal;
import
org.jboss.ide.eclipse.as.core.server.internal.extendedproperties.ServerExtendedProperties;