diff options
| author | Tom Schindl | 2015-10-28 17:56:24 +0000 |
|---|---|---|
| committer | Thomas Schindl | 2015-11-10 20:52:02 +0000 |
| commit | 7609e41400d6fd2b11dd4ba4fdab5984527b60b3 (patch) | |
| tree | 83872fb82144f1df1bc71e862bc5684045245628 | |
| parent | 785fcd462a8391598a1b6baa7704e0fa9d93a6b3 (diff) | |
| download | eclipse.platform.runtime-7609e41400d6fd2b11dd4ba4fdab5984527b60b3.tar.gz eclipse.platform.runtime-7609e41400d6fd2b11dd4ba4fdab5984527b60b3.tar.xz eclipse.platform.runtime-7609e41400d6fd2b11dd4ba4fdab5984527b60b3.zip | |
Bug 480909 - DS Warnings because of typo MessageFactoryImpl#unsetLogSerivce
Change-Id: Ie9f823a91270f465493c161351f933a2f82750d8
| -rw-r--r-- | bundles/org.eclipse.e4.core.services/OSGI-INF/messagesfactory.xml | 2 | ||||
| -rw-r--r-- | bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/internal/services/MessageFactoryServiceImpl.java | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/bundles/org.eclipse.e4.core.services/OSGI-INF/messagesfactory.xml b/bundles/org.eclipse.e4.core.services/OSGI-INF/messagesfactory.xml index fd5a13476..bd5d46227 100644 --- a/bundles/org.eclipse.e4.core.services/OSGI-INF/messagesfactory.xml +++ b/bundles/org.eclipse.e4.core.services/OSGI-INF/messagesfactory.xml @@ -4,5 +4,5 @@ <service> <provide interface="org.eclipse.e4.core.services.nls.IMessageFactoryService"/> </service> - <reference bind="setLogService" cardinality="0..1" interface="org.osgi.service.log.LogService" name="LogService" policy="dynamic" unbind="unsetLogSerivce"/> + <reference bind="setLogService" cardinality="0..1" interface="org.osgi.service.log.LogService" name="LogService" policy="dynamic" unbind="unsetLogService"/> </scr:component> diff --git a/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/internal/services/MessageFactoryServiceImpl.java b/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/internal/services/MessageFactoryServiceImpl.java index dc22542de..b9e4fc039 100644 --- a/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/internal/services/MessageFactoryServiceImpl.java +++ b/bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/internal/services/MessageFactoryServiceImpl.java @@ -266,8 +266,10 @@ public class MessageFactoryServiceImpl implements IMessageFactoryService { } } - public void unsetLogService() { - setLogService(null); + public void unsetLogService(LogService logService) { + if (this.logService == logService) { + this.logService = null; + } } public void setLogService(LogService logService) { |