You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by md...@apache.org on 2014/10/27 13:33:32 UTC
[2/3] git commit: [SYNCOPE-558] Managing Template layout for
AttributePanel
[SYNCOPE-558] Managing Template layout for AttributePanel
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/79ddbdc3
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/79ddbdc3
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/79ddbdc3
Branch: refs/heads/master
Commit: 79ddbdc3aca57e2b53a75878d8be5943dea00d54
Parents: c0e751f
Author: Marco Di Sabatino Di Diodoro <md...@apache.org>
Authored: Mon Oct 27 13:30:42 2014 +0100
Committer: Marco Di Sabatino Di Diodoro <md...@apache.org>
Committed: Mon Oct 27 13:30:42 2014 +0100
----------------------------------------------------------------------
.../org/apache/syncope/console/commons/AttrLayoutType.java | 6 +-----
.../apache/syncope/console/rest/ConfigurationRestClient.java | 4 ++++
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/79ddbdc3/console/src/main/java/org/apache/syncope/console/commons/AttrLayoutType.java
----------------------------------------------------------------------
diff --git a/console/src/main/java/org/apache/syncope/console/commons/AttrLayoutType.java b/console/src/main/java/org/apache/syncope/console/commons/AttrLayoutType.java
index 38a51f8..9eac93b 100644
--- a/console/src/main/java/org/apache/syncope/console/commons/AttrLayoutType.java
+++ b/console/src/main/java/org/apache/syncope/console/commons/AttrLayoutType.java
@@ -88,11 +88,7 @@ public enum AttrLayoutType {
default:
}
}
-
- if (result == null) {
- throw new IllegalArgumentException("Could not find any valid instance for " + mode + " and " + attrType);
- }
-
+
return result;
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/79ddbdc3/console/src/main/java/org/apache/syncope/console/rest/ConfigurationRestClient.java
----------------------------------------------------------------------
diff --git a/console/src/main/java/org/apache/syncope/console/rest/ConfigurationRestClient.java b/console/src/main/java/org/apache/syncope/console/rest/ConfigurationRestClient.java
index 2576a60..c650812 100644
--- a/console/src/main/java/org/apache/syncope/console/rest/ConfigurationRestClient.java
+++ b/console/src/main/java/org/apache/syncope/console/rest/ConfigurationRestClient.java
@@ -53,6 +53,10 @@ public class ConfigurationRestClient extends BaseRestClient {
}
public AttributeTO readAttrLayout(final AttrLayoutType type) {
+ if (type == null) {
+ return null;
+ }
+
AttributeTO attrLayout = read(type.getConfKey());
if (attrLayout == null) {
attrLayout = new AttributeTO();