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

do not append non valid ClassOverrides

Browse Source
This commit is contained in:
Sebastian Sdorra
2012-03-04 19:46:44 +01:00
parent d7face5091
commit 410ce2fb4d
2 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
scm-webapp/src/main/java/sonia/scm/ClassOverride.java
View File

@@ -41,7 +41,7 @@ import javax.xml.bind.annotation.XmlAccessorType;
* @author Sebastian Sdorra
*/
@XmlAccessorType(XmlAccessType.FIELD)
public class ClassOverride
public class ClassOverride implements Validateable
{
/**
@@ -66,6 +66,18 @@ public class ClassOverride
return to;
}
/**
* Method description
*
*
* @return
*/
@Override
public boolean isValid()
{
return (bind != null) && (to != null);
}
//~--- set methods ----------------------------------------------------------
/**

16
scm-webapp/src/main/java/sonia/scm/ClassOverrides.java
View File

@@ -36,6 +36,8 @@ package sonia.scm;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import sonia.scm.util.AssertUtil;
//~--- JDK imports ------------------------------------------------------------
import java.io.IOException;
@@ -157,7 +159,19 @@ public class ClassOverrides implements Iterable<ClassOverride>
*/
public void append(ClassOverrides overrides)
{
getOverrides().addAll(overrides.getOverrides());
AssertUtil.assertIsNotNull(overrides);
for (ClassOverride co : overrides)
{
if (co.isValid())
{
getOverrides().add(co);
}
else if (logger.isWarnEnabled())
{
logger.warn("could not append ClassOverride, because it is not valid");
}
}
}
/**