1 files changed, 9 insertions, 2 deletions
diff --git a/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/src/org/eclipse/papyrus/infra/core/serviceregistry/internal/ServiceEntry.java b/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/src/org/eclipse/papyrus/infra/core/serviceregistry/internal/ServiceEntry.java
index 6582c17d608..c19a671052a 100644
--- a/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/src/org/eclipse/papyrus/infra/core/serviceregistry/internal/ServiceEntry.java
+++ b/incoming/serviceregistry/org.eclipse.papyrus.infra.core.serviceregistry/src/org/eclipse/papyrus/infra/core/serviceregistry/internal/ServiceEntry.java
@@ -56,10 +56,12 @@ public class ServiceEntry extends ServiceTypeEntry {
 	 * @throws ServiceException
 	 *         If service can't be started.
 	 */
+	@Override
 	public Object getServiceInstance() throws ServiceException {
 
-		if(serviceInstance == null)
+		if(serviceInstance == null) {
 			throw new BadStateException("Service is not created.", state, serviceDescriptor);
+		}
 
 		return serviceInstance;
 
@@ -80,6 +82,7 @@ public class ServiceEntry extends ServiceTypeEntry {
 	 * 
 	 * @throws ServiceException
 	 */
+	@Override
 	public void createService() throws ServiceException {
 		checkState(ServiceState.registered);
 		// Exit if already created.
@@ -107,6 +110,7 @@ public class ServiceEntry extends ServiceTypeEntry {
 	 * 
 	 * @throws ServiceException
 	 */
+	@Override
 	public void initService(ServicesRegistry servicesRegistry) throws ServiceException {
 		checkState(ServiceState.created);
 		try {
@@ -127,6 +131,7 @@ public class ServiceEntry extends ServiceTypeEntry {
 	 * 
 	 * @throws ServiceException
 	 */
+	@Override
 	public void startService() throws ServiceException {
 
 		checkState(ServiceState.initialized);
@@ -148,9 +153,11 @@ public class ServiceEntry extends ServiceTypeEntry {
 	/**
 	 * Dispose the service.
 	 */
+	@Override
 	public void disposeService() throws ServiceException {
-		if(serviceInstance == null)
+		if(serviceInstance == null) {
 			return;
+		}
 
 		serviceInstance.disposeService();
 		serviceInstance = null;