diff options
| author | Mikaël Barbero | 2012-08-28 12:27:25 +0000 |
|---|---|---|
| committer | Mikaël Barbero | 2012-08-28 12:27:25 +0000 |
| commit | 1f2507b76006ce3dbe0e6bda5a1face92c71d902 (patch) | |
| tree | 95dacc614396b758b88032e51075fbca5937f7c0 | |
| parent | 565919f0d7660e796d39ff3be43897bf7f03b399 (diff) | |
| download | org.eclipse.emf.compare-1f2507b76006ce3dbe0e6bda5a1face92c71d902.tar.gz org.eclipse.emf.compare-1f2507b76006ce3dbe0e6bda5a1face92c71d902.tar.xz org.eclipse.emf.compare-1f2507b76006ce3dbe0e6bda5a1face92c71d902.zip | |
fix potential NPE
| -rw-r--r-- | plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/provider/StringAttributeChangeAccessor.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/provider/StringAttributeChangeAccessor.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/provider/StringAttributeChangeAccessor.java index 29b44d942..a0a505d35 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/provider/StringAttributeChangeAccessor.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/provider/StringAttributeChangeAccessor.java @@ -97,7 +97,11 @@ public class StringAttributeChangeAccessor implements ITypedElement, IStreamCont public InputStream getContents() throws CoreException {
Object value = fEObject.eGet(fEAtribute);
String stringValue = EcoreUtil.convertToString(fEAtribute.getEAttributeType(), value);
- return new ByteArrayInputStream(stringValue.getBytes());
+ if (stringValue != null) {
+ return new ByteArrayInputStream(stringValue.getBytes());
+ } else {
+ return new ByteArrayInputStream(new byte[0]);
+ }
}
/**
|