From f5618c87e63deb99920710787f6dcd34d4b17425 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 13 Apr 2016 18:41:29 +0200
Subject: (WiP) Global image sync

---
 src/main/java/org/openslx/imagemaster/session/Authenticator.java  | 2 +-
 src/main/java/org/openslx/imagemaster/session/SessionManager.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/main/java/org/openslx/imagemaster/session')

diff --git a/src/main/java/org/openslx/imagemaster/session/Authenticator.java b/src/main/java/org/openslx/imagemaster/session/Authenticator.java
index ea7e581..c11e597 100644
--- a/src/main/java/org/openslx/imagemaster/session/Authenticator.java
+++ b/src/main/java/org/openslx/imagemaster/session/Authenticator.java
@@ -36,7 +36,7 @@ public class Authenticator
 
 		LocalUser user;
 		try {
-			user = DbUser.forLogin( login, password );
+			user = DbUser.forUserId( login, password );
 		} catch ( SQLException e ) {
 			throw new TInvocationException( InvocationError.INTERNAL_SERVER_ERROR, "Could not connect to database" );
 		} // throws exception if credentials are invalid
diff --git a/src/main/java/org/openslx/imagemaster/session/SessionManager.java b/src/main/java/org/openslx/imagemaster/session/SessionManager.java
index c12334a..c141d24 100644
--- a/src/main/java/org/openslx/imagemaster/session/SessionManager.java
+++ b/src/main/java/org/openslx/imagemaster/session/SessionManager.java
@@ -81,7 +81,7 @@ public class SessionManager
 		}, 123, TimeUnit.MINUTES.toMillis( 13 ) );
 	}
 
-	public static Object getSessionFromSessionId( String sessionId )
+	public static Session getSessionFromSessionId( String sessionId )
 	{
 		if ( sessionId == null || sessionId.length() != 64 ) {
 			log.debug( "invalid sessionid format: " + sessionId );
-- 
cgit v1.2.3-55-g7522