diff options
| author | Simon Rettberg | 2014-07-07 15:12:44 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2014-07-07 15:12:44 +0200 |
| commit | daa49262e30bfa3e10f411c18a2034ca48dcb3c2 (patch) | |
| tree | 3108962e085b10e053d6a3c9e96692c683f75653 /src/main/java/org/openslx/imagemaster/server | |
| parent | Add port to up- and download thingis (diff) | |
| download | masterserver-daa49262e30bfa3e10f411c18a2034ca48dcb3c2.tar.gz masterserver-daa49262e30bfa3e10f411c18a2034ca48dcb3c2.tar.xz masterserver-daa49262e30bfa3e10f411c18a2034ca48dcb3c2.zip | |
more TODOs
Diffstat (limited to 'src/main/java/org/openslx/imagemaster/server')
| -rw-r--r-- | src/main/java/org/openslx/imagemaster/server/ApiServer.java | 6 |
1 files changed, 3 insertions, 3 deletions
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 ) { |