Merge branch 'master' of ssh://git.eclipse.org/gitroot/emfclient/org.eclipse.emf.ecp.other
diff --git a/ECP2/org.eclipse.emf.ecp.cdo.core/src/org/eclipse/emf/ecp/cdo/internal/core/Activator.java b/ECP2/org.eclipse.emf.ecp.cdo.core/src/org/eclipse/emf/ecp/cdo/internal/core/Activator.java
index 82d779a..5586193 100644
--- a/ECP2/org.eclipse.emf.ecp.cdo.core/src/org/eclipse/emf/ecp/cdo/internal/core/Activator.java
+++ b/ECP2/org.eclipse.emf.ecp.cdo.core/src/org/eclipse/emf/ecp/cdo/internal/core/Activator.java
@@ -84,9 +84,14 @@
return null;
}
};
-
- serverBrowser.setPort(7778);
- serverBrowser.activate();
+ // TODO: Please check this. Added. because EMFCP fails on start up if this port is in use
+ try {
+ serverBrowser.setPort(7778);
+ serverBrowser.activate();
+ } catch (Exception e) {
+ log(e.getMessage());
+ // TODO: Please check this. Added. because EMFCP fails on start up if this port is in use
+ }
}
@Override
