Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Vosburgh2016-08-25 18:30:41 +0000
committerBrian Vosburgh2017-05-18 22:38:58 +0000
commitd345943564dbdbf3bc4a71ec35f936b48a834584 (patch)
tree40b9266489a7e6eeb4e31d501a42d81b1d83fb7c
parente8d90fff6e1c1691acf6624a2b4456153d087025 (diff)
downloadwebtools.dali-d345943564dbdbf3bc4a71ec35f936b48a834584.tar.gz
webtools.dali-d345943564dbdbf3bc4a71ec35f936b48a834584.tar.xz
webtools.dali-d345943564dbdbf3bc4a71ec35f936b48a834584.zip
fix NPE in DTPConnectionProfileWrapper
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.db/src/org/eclipse/jpt/jpa/db/internal/DTPConnectionProfileWrapper.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.db/src/org/eclipse/jpt/jpa/db/internal/DTPConnectionProfileWrapper.java b/jpa/plugins/org.eclipse.jpt.jpa.db/src/org/eclipse/jpt/jpa/db/internal/DTPConnectionProfileWrapper.java
index 95a809f9cb..841f2c455b 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.db/src/org/eclipse/jpt/jpa/db/internal/DTPConnectionProfileWrapper.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.db/src/org/eclipse/jpt/jpa/db/internal/DTPConnectionProfileWrapper.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2006, 2016 Oracle. 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 http://www.eclipse.org/legal/epl-v10.html.
@@ -157,7 +157,7 @@ final class DTPConnectionProfileWrapper
public String getUserName() {
String userName = this.getProperty(IJDBCDriverDefinitionConstants.USERNAME_PROP_ID);
- return this.extractUserName(userName.trim());
+ return (userName == null) ? null : this.extractUserName(userName.trim());
}
private String extractUserName(String userName) {

Back to the top