Repository: ambari Updated Branches: refs/heads/branch-1.7.0 f445174e1 -> fb7daf4b1
AMBARI-7768 - Views: Masked property not encoded on newly created instance Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/fb7daf4b Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fb7daf4b Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fb7daf4b Branch: refs/heads/branch-1.7.0 Commit: fb7daf4b1d688638d36f54313800a522d3105567 Parents: f445174 Author: tbeerbower <[email protected]> Authored: Tue Oct 14 10:56:46 2014 -0400 Committer: tbeerbower <[email protected]> Committed: Tue Oct 14 10:56:46 2014 -0400 ---------------------------------------------------------------------- .../apache/ambari/server/view/ViewContextImpl.java | 4 +++- .../org/apache/ambari/server/view/ViewRegistry.java | 16 ++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/fb7daf4b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewContextImpl.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewContextImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewContextImpl.java index 0f6cf9f..7fea0d5 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewContextImpl.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewContextImpl.java @@ -207,7 +207,9 @@ public class ViewContextImpl implements ViewContext, ViewController { try { viewRegistry.updateViewInstance(viewInstanceEntity); } catch (SystemException e) { - LOG.error("Caught exception updating the view instance.", e); + String msg = "Caught exception updating the view instance."; + LOG.error(msg, e); + throw new IllegalStateException(msg, e); } } http://git-wip-us.apache.org/repos/asf/ambari/blob/fb7daf4b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java index 83e91cd..cff1e2d 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java @@ -479,7 +479,7 @@ public class ViewRegistry { version + "/" + instanceName); } - SetViewInstanceProperties(instanceEntity, viewEntity.getConfiguration(), viewEntity.getClassLoader()); + setViewInstanceProperties(instanceEntity, viewEntity.getConfiguration(), viewEntity.getClassLoader()); instanceEntity.validate(viewEntity); ResourceTypeEntity resourceTypeEntity = resourceTypeDAO.findByName(ViewEntity.getViewName(viewName, version)); @@ -534,7 +534,7 @@ public class ViewRegistry { ViewEntity viewEntity = getDefinition(instanceEntity.getViewName()); if (viewEntity != null) { - SetViewInstanceProperties(instanceEntity, viewEntity.getConfiguration(), viewEntity.getClassLoader()); + setViewInstanceProperties(instanceEntity, viewEntity.getConfiguration(), viewEntity.getClassLoader()); instanceEntity.validate(viewEntity); instanceDAO.merge(instanceEntity); } @@ -881,7 +881,7 @@ public class ViewRegistry { ViewInstanceEntity viewInstanceDefinition = new ViewInstanceEntity(viewDefinition, instanceConfig); - SetViewInstanceProperties(viewInstanceDefinition, instanceConfig, viewConfig, viewDefinition.getClassLoader()); + setViewInstanceProperties(viewInstanceDefinition, instanceConfig, viewConfig, viewDefinition.getClassLoader()); viewInstanceDefinition.validate(viewDefinition); bindViewInstance(viewDefinition, viewInstanceDefinition); @@ -928,7 +928,7 @@ public class ViewRegistry { } // Set the properties of the given view instance. - private void SetViewInstanceProperties(ViewInstanceEntity instanceEntity, ViewConfig viewConfig, ClassLoader classLoader) throws SystemException { + private void setViewInstanceProperties(ViewInstanceEntity instanceEntity, ViewConfig viewConfig, ClassLoader classLoader) throws SystemException { Map<String, String> properties = new HashMap<String, String>(); @@ -938,22 +938,22 @@ public class ViewRegistry { for (ViewInstancePropertyEntity viewInstancePropertyEntity : propertyEntities) { properties.put(viewInstancePropertyEntity.getName(), viewInstancePropertyEntity.getValue()); } - SetViewInstanceProperties( instanceEntity, properties, viewConfig, classLoader); + setViewInstanceProperties(instanceEntity, properties, viewConfig, classLoader); } // Set the properties of the given view instance from the given instance configuration. - private void SetViewInstanceProperties(ViewInstanceEntity instanceEntity, InstanceConfig instanceConfig, ViewConfig viewConfig, ClassLoader classLoader) throws SystemException { + private void setViewInstanceProperties(ViewInstanceEntity instanceEntity, InstanceConfig instanceConfig, ViewConfig viewConfig, ClassLoader classLoader) throws SystemException { Map<String, String> properties = new HashMap<String, String>(); for (PropertyConfig propertyConfig : instanceConfig.getProperties()) { properties.put(propertyConfig.getKey(), propertyConfig.getValue()); } - SetViewInstanceProperties( instanceEntity, properties, viewConfig, classLoader); + setViewInstanceProperties(instanceEntity, properties, viewConfig, classLoader); } // Set the properties of the given view instance from the given property set. - private void SetViewInstanceProperties(ViewInstanceEntity instanceEntity, Map<String, String> properties, ViewConfig viewConfig, ClassLoader classLoader) throws SystemException { + private void setViewInstanceProperties(ViewInstanceEntity instanceEntity, Map<String, String> properties, ViewConfig viewConfig, ClassLoader classLoader) throws SystemException { try { Masker masker = getMasker(viewConfig.getMaskerClass(classLoader));
