Yair Zaslavsky has uploaded a new change for review. Change subject: aaa: Fixup ......................................................................
aaa: Fixup Fixing some issues that were discovered during verification Topic: AAA Change-Id: I68f06bef0c4479e6c03ada0ace9c6b2128753949 Signed-off-by: Yair Zaslavsky <[email protected]> --- M backend/manager/modules/extension-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/ExtensionManager.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/EngineLocalConfig.java 2 files changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/91/25191/1 diff --git a/backend/manager/modules/extension-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/ExtensionManager.java b/backend/manager/modules/extension-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/ExtensionManager.java index 25d9c61..2d5b94d 100644 --- a/backend/manager/modules/extension-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/ExtensionManager.java +++ b/backend/manager/modules/extension-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/ExtensionManager.java @@ -216,6 +216,7 @@ activatedEntries.put(entry.getName(), entry); MultiValueMapUtils.addToMap(entry.getProvides(), entry, providesEntries); } catch (Exception ex) { + entry.enabled = false; log.error( String.format( "Error in activating extension %1$s. Exception message is %2$s", diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/EngineLocalConfig.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/EngineLocalConfig.java index 9445473..972faf4 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/EngineLocalConfig.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/EngineLocalConfig.java @@ -226,7 +226,7 @@ * Returns the directory for custom/3rd party extension configuration files */ public List<File> getExtensionsDirectories() { - String path = getProperty("ENGINE_EXTENSION_PATH"); + String path = getProperty("ENGINE_EXTENSION_PATH", true); if (path == null) { return Collections.emptyList(); } -- To view, visit http://gerrit.ovirt.org/25191 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I68f06bef0c4479e6c03ada0ace9c6b2128753949 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yair Zaslavsky <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
