From daa49262e30bfa3e10f411c18a2034ca48dcb3c2 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 7 Jul 2014 15:12:44 +0200
Subject: more TODOs

---
 src/main/java/org/openslx/imagemaster/server/ApiServer.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/src/main/java/org/openslx/imagemaster/server/ApiServer.java b/src/main/java/org/openslx/imagemaster/server/ApiServer.java
index 2d50160..ac1ab85 100644
--- a/src/main/java/org/openslx/imagemaster/server/ApiServer.java
+++ b/src/main/java/org/openslx/imagemaster/server/ApiServer.java
@@ -83,7 +83,7 @@ public class ApiServer
 		return new UserInfo( session.getUserId(), session.getFirstName(),
 				session.getLastName(), session.getEMail() );
 	}
-
+// TODO: Remove old code that's not needed anymore - that's what a vcs is for...
 //	/**
 //	 * Request ftp credentials to upload a new image to the masterserver.
 //	 * 
@@ -154,7 +154,7 @@ public class ApiServer
 	public static String startServerAuthentication( String organization )
 			throws ServerAuthenticationException
 	{
-		if ( organization == null || organization == "" ) {
+		if ( organization == null || organization.isEmpty() ) {
 			throw new ServerAuthenticationException( ServerAuthenticationError.INVALID_ORGANIZATION, "Empty organization" );
 		}
 		if ( DbSatellite.fromOrganization( organization ) == null ) {
@@ -173,7 +173,7 @@ public class ApiServer
 	 * @throws TException
 	 */
 	public static ServerSessionData serverAuthenticate( String organization,
-			ByteBuffer challengeResponse ) throws AuthenticationException,
+			ByteBuffer challengeResponse ) throws ServerAuthenticationException,
 			TException
 	{
 		if ( organization == null || challengeResponse == null ) {
-- 
cgit v1.2.3-55-g7522