Merge pull request #41 from fmagin/plugin_not_activated

Avoid NullPointerExceptions if plugin isn't activated yet
astrelsky · Jun 20, 2021 · c39bb32 · c39bb32
2 parents f2f2bf3 + 5900b15
commit c39bb32
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/main/java/cppclassanalyzer/scanner/ItaniumAbiRttiScanner.java b/src/main/java/cppclassanalyzer/scanner/ItaniumAbiRttiScanner.java
@@ -154,6 +154,7 @@ protected boolean doScan(MessageLog log, TaskMonitor monitor) throws CancelledEx
 	@Override
 	public Set<Address> scanFundamentals(MessageLog log, TaskMonitor monitor)
 			throws CancelledException {
+		this.monitor = monitor;
 		relocations.addAll(getRelocations(CLASS_TYPESTRINGS));
 		if (!relocations.isEmpty()) {
 			relocatable = true;

diff --git a/src/main/java/cppclassanalyzer/utils/CppClassAnalyzerUtils.java b/src/main/java/cppclassanalyzer/utils/CppClassAnalyzerUtils.java
@@ -143,7 +143,7 @@ public static ProgramClassTypeInfoManager getManager(Program program) {
 		} else {
 			service = getService(program);
 		}
-		return service.getManager(program);
+		return service != null ? service.getManager(program) : null;
 	}
 
 	/**