| commit | 34586f803e02f0fb1e8e52fe23a92ae5aa593ab7 | [log] [tgz] |
|---|---|---|
| author | alopez <angel.lopez@tecnalia.com> | Thu Mar 07 11:03:38 2019 +0100 |
| committer | alopez <angel.lopez@tecnalia.com> | Thu Mar 07 11:03:38 2019 +0100 |
| tree | 0240e31be624f73fc386d5439d68a47071a697a1 | |
| parent | 6f19b1b49fa0717679323983821ed4ba0b43c57d [diff] |
Bug fixed connecting to the CDOServer when launching the Client
diff --git a/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/views/DawnExplorer.java b/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/views/DawnExplorer.java index 8e24594..0d34201 100644 --- a/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/views/DawnExplorer.java +++ b/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/views/DawnExplorer.java
@@ -170,8 +170,22 @@ { CDOConnectionUtil.instance.init(PreferenceConstants.getRepositoryName(), PreferenceConstants.getProtocol(), PreferenceConstants.getServerName()); - CDOSession session = CDOConnectionUtil.instance.openSession(); - view = CDOConnectionUtil.instance.openView(session); + + CDOSession sessionCDO = CDOConnectionUtil.instance.getCurrentSession(); + if(sessionCDO == null){ + try { + //To wait the connection establishment in Repository Explorer Thread + Thread.sleep(1500); + sessionCDO = CDOConnectionUtil.instance.getCurrentSession(); + sessionCDO = CDOConnectionUtil.instance.openSession(); + } catch (InterruptedException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + } + //CDOSession session = CDOConnectionUtil.instance.openSession(); + view = CDOConnectionUtil.instance.openView(sessionCDO); } catch (ConnectorException ex)
diff --git a/org.eclipse.opencert.apm.assurproj.reuse/src/org/eclipse/opencert/apm/assurproj/reuse/views/ReuseAssistanceView.java b/org.eclipse.opencert.apm.assurproj.reuse/src/org/eclipse/opencert/apm/assurproj/reuse/views/ReuseAssistanceView.java index 28a7096..e329fcc 100644 --- a/org.eclipse.opencert.apm.assurproj.reuse/src/org/eclipse/opencert/apm/assurproj/reuse/views/ReuseAssistanceView.java +++ b/org.eclipse.opencert.apm.assurproj.reuse/src/org/eclipse/opencert/apm/assurproj/reuse/views/ReuseAssistanceView.java Binary files differ