Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-07 22:15:45 +01:00
Code Issues Packages Projects Releases Activity

fix nullpointerexcpetion on first login

Browse Source
This commit is contained in:
Sebastian Sdorra
2011-02-15 19:19:05 +01:00
parent ac0c127af5
commit 92883e4f50
6 changed files with 45 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scm-webapp/src/main/java/sonia/scm/api/rest/resources/AuthenticationResource.java
View File

@@ -127,7 +127,7 @@ public class AuthenticationResource
if ((user != null) &&!SCMContext.USER_ANONYMOUS.equals(user.getName()))
{
state = new ScmState(contextProvider, securityContext,
repositoryManger.getTypes());
repositoryManger.getConfiguredTypes());
}
else
{
@@ -161,7 +161,7 @@ public class AuthenticationResource
if (user != null)
{
ScmState state = new ScmState(contextProvider, securityContext,
repositoryManger.getTypes());
repositoryManger.getConfiguredTypes());
resp = Response.ok(state).build();
}
@@ -199,7 +199,7 @@ public class AuthenticationResource
}
state = new ScmState(contextProvider, securityContext,
repositoryManger.getTypes());
repositoryManger.getConfiguredTypes());
response = Response.ok(state).build();
}
else

14
scm-webapp/src/main/java/sonia/scm/group/xml/XmlGroupDatabase.java
View File

@@ -59,6 +59,20 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
public class XmlGroupDatabase
{
/**
* Constructs ...
*
*/
public XmlGroupDatabase()
{
long c = System.currentTimeMillis();
creationTime = c;
lastModified = c;
}
//~--- methods --------------------------------------------------------------
/**
* Method description
*

1
scm-webapp/src/main/java/sonia/scm/group/xml/XmlGroupManager.java
View File

@@ -209,7 +209,6 @@ public class XmlGroupManager extends AbstractGroupManager
if (groupDB == null)
{
groupDB = new XmlGroupDatabase();
groupDB.setCreationTime(System.currentTimeMillis());
}
}

14
scm-webapp/src/main/java/sonia/scm/repository/xml/XmlRepositoryDatabase.java
View File

@@ -59,6 +59,20 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
public class XmlRepositoryDatabase
{
/**
* Constructs ...
*
*/
public XmlRepositoryDatabase()
{
long c = System.currentTimeMillis();
creationTime = c;
lastModified = c;
}
//~--- methods --------------------------------------------------------------
/**
* Method description
*

14
scm-webapp/src/main/java/sonia/scm/user/xml/XmlUserDatabase.java
View File

@@ -59,6 +59,20 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
public class XmlUserDatabase
{
/**
* Constructs ...
*
*/
public XmlUserDatabase()
{
long c = System.currentTimeMillis();
creationTime = c;
lastModified = c;
}
//~--- methods --------------------------------------------------------------
/**
* Method description
*

1
scm-webapp/src/main/java/sonia/scm/user/xml/XmlUserManager.java
View File

@@ -242,7 +242,6 @@ public class XmlUserManager extends AbstractUserManager
if (userDB == null)
{
userDB = new XmlUserDatabase();
userDB.setCreationTime(System.currentTimeMillis());
createDefaultAccounts();
}
}