IDDES-1526 NPE In JdbcManagerImpl Starting With Clean Workspace And R…

…unning JDBC Importer Fixes an NPE in JdbcDataseImpl for driver name.
Teiid-Designer · Nov 1, 2012 · 9b63132 · 9b63132
1 parent 05e750b
commit 9b63132
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/plugins/org.teiid.designer.jdbc/src/org/teiid/designer/jdbc/JdbcManagerImpl.java b/plugins/org.teiid.designer.jdbc/src/org/teiid/designer/jdbc/JdbcManagerImpl.java
@@ -103,7 +103,7 @@ public static JdbcManager create( final String name ) {
     }
 
     /**
-     * @return The shared instance of this class.
+     * @return The shared instance of this class (can be <code>null</code>)
      * @since 5.0
      */
     public static JdbcManager get() {

diff --git a/...s/org.teiid.designer.jdbc/src/org/teiid/designer/jdbc/metadata/impl/JdbcDatabaseImpl.java b/...s/org.teiid.designer.jdbc/src/org/teiid/designer/jdbc/metadata/impl/JdbcDatabaseImpl.java
@@ -563,7 +563,7 @@ public Includes getIncludes() {
     public IStatus selectDefaultNodes( String username ) {
         try {
         	String driverName = this.getDatabaseInfo().getDriverName();
-        	if( driverName.toUpperCase().contains("TEIID") ) { //$NON-NLS-1$
+        	if( driverName != null && driverName.toUpperCase().contains("TEIID") ) { //$NON-NLS-1$
         		return Status.OK_STATUS;
         	}
             boolean isExcelOrAccess = false;