summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaren Butzke2012-09-19 15:18:31 (EDT)
committerKaren Butzke2012-09-19 15:18:31 (EDT)
commitb1b50ee8566d5400a668a2006723b8adb8d4e5e8 (patch)
tree5304758a9162130204b45e793c91dc3b0e869063
parentde04e3523c72b4aeefeca2fbf15dcd5ac8eec733 (diff)
downloadwebtools.dali-b1b50ee8566d5400a668a2006723b8adb8d4e5e8.zip
webtools.dali-b1b50ee8566d5400a668a2006723b8adb8d4e5e8.tar.gz
webtools.dali-b1b50ee8566d5400a668a2006723b8adb8d4e5e8.tar.bz2
Bug 389912 - NullPointerException synchronize with java source
-rw-r--r--common/features/org.eclipse.jpt.common.feature/feature.xml2
-rw-r--r--common/plugins/org.eclipse.jpt.common.core/META-INF/MANIFEST.MF2
-rw-r--r--common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/internal/resource/java/source/SourceMethod.java6
3 files changed, 5 insertions, 5 deletions
diff --git a/common/features/org.eclipse.jpt.common.feature/feature.xml b/common/features/org.eclipse.jpt.common.feature/feature.xml
index bcead0a..691350c 100644
--- a/common/features/org.eclipse.jpt.common.feature/feature.xml
+++ b/common/features/org.eclipse.jpt.common.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jpt.common.feature"
label="%featureName"
- version="1.2.1.qualifier"
+ version="1.2.2.qualifier"
provider-name="%providerName"
plugin="org.eclipse.jpt.common.branding"
license-feature="org.eclipse.license"
diff --git a/common/plugins/org.eclipse.jpt.common.core/META-INF/MANIFEST.MF b/common/plugins/org.eclipse.jpt.common.core/META-INF/MANIFEST.MF
index 624f5a6..8ab16fa 100644
--- a/common/plugins/org.eclipse.jpt.common.core/META-INF/MANIFEST.MF
+++ b/common/plugins/org.eclipse.jpt.common.core/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.jpt.common.core;singleton:=true
-Bundle-Version: 1.2.1.qualifier
+Bundle-Version: 1.2.2.qualifier
Bundle-Activator: org.eclipse.jpt.common.core.JptCommonCorePlugin
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
diff --git a/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/internal/resource/java/source/SourceMethod.java b/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/internal/resource/java/source/SourceMethod.java
index d92d2d7..cc9955e 100644
--- a/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/internal/resource/java/source/SourceMethod.java
+++ b/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/internal/resource/java/source/SourceMethod.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2010, 2011 Oracle. All rights reserved.
+ * Copyright (c) 2010, 2012 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.
@@ -86,7 +86,7 @@ final class SourceMethod
public void initialize(MethodDeclaration methodDeclaration) {
super.initialize(methodDeclaration);
IMethodBinding binding = methodDeclaration.resolveBinding();
- this.initialize(binding.getReturnType());
+ this.initialize(binding == null ? null : binding.getReturnType());
this.initialize(binding);
}
@@ -117,7 +117,7 @@ final class SourceMethod
public void synchronizeWith(MethodDeclaration methodDeclaration) {
super.synchronizeWith(methodDeclaration);
IMethodBinding binding = methodDeclaration.resolveBinding();
- this.synchronizeWith(binding.getReturnType());
+ this.synchronizeWith(binding == null ? null : binding.getReturnType());
this.synchronizeWith(binding);
}