Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
View | Details | Raw Unified | Return to bug 395265
Collapse All | Expand All

(-)src/org/eclipse/emf/ecp/emfstore/core/internal/EMFStoreProvider.java (-17 / +6 lines)
Lines 75-96 Link Here
75
			}
75
			}
76
		} else if (parent instanceof InternalRepository) {
76
		} else if (parent instanceof InternalRepository) {
77
			ServerInfo serverInfo = getServerInfo((InternalRepository) parent);
77
			ServerInfo serverInfo = getServerInfo((InternalRepository) parent);
78
			if (serverInfo.getLastUsersession() != null) {
78
			if (serverInfo.getLastUsersession() != null && serverInfo.getLastUsersession().isLoggedIn()) {
79
				try {
79
				EList<ProjectInfo> projectInfos = serverInfo.getProjectInfos();
80
					if (!serverInfo.getLastUsersession().isLoggedIn()
80
				for (ProjectInfo projectInfo : projectInfos) {
81
						&& serverInfo.getLastUsersession().getSessionId() != null) {
81
					childrenList.addChild(new EMFStoreProjectWrapper((InternalRepository) parent,
82
						serverInfo.getLastUsersession().logIn();
82
						new EMFStoreCheckoutData(serverInfo, projectInfo)));
83
					}
84
					EList<ProjectInfo> projectInfos = serverInfo.getProjectInfos();
85
					for (ProjectInfo projectInfo : projectInfos) {
86
						childrenList.addChild(new EMFStoreProjectWrapper((InternalRepository) parent,
87
							new EMFStoreCheckoutData(serverInfo, projectInfo)));
88
					}
89
90
				} catch (AccessControlException ex) {
91
					Activator.log(ex);
92
				} catch (EmfStoreException e) {
93
					Activator.log(e);
94
				}
83
				}
95
84
96
			}
85
			}
Lines 297-303 Link Here
297
					internalRepository.getProperties().getValue(EMFStoreProvider.PROP_CERTIFICATE));
286
					internalRepository.getProperties().getValue(EMFStoreProvider.PROP_CERTIFICATE));
298
				workspace.addServerInfo(serverInfo);
287
				workspace.addServerInfo(serverInfo);
299
				workspace.save();
288
				workspace.save();
300
			} else {
289
			} else if (!foundExisting && !internalRepository.getProperties().hasProperties()) {
301
				serverInfo = EMFStoreClientUtil.giveServerInfo("localhost", 8080);
290
				serverInfo = EMFStoreClientUtil.giveServerInfo("localhost", 8080);
302
			}
291
			}
303
			internalRepository.setProviderSpecificData(serverInfo);
292
			internalRepository.setProviderSpecificData(serverInfo);

Return to bug 395265