deltaspike-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From johndam...@apache.org
Subject [1/3] deltaspike git commit: DELTASPIKE-645 squid:S2583 - Conditions should not unconditionally evaluate to 'TRUE' or to 'FALSE'
Date Wed, 13 Jul 2016 04:01:40 GMT
Repository: deltaspike
Updated Branches:
  refs/heads/master 7b3606bb4 -> 712fc6dca


DELTASPIKE-645 squid:S2583 - Conditions should not unconditionally evaluate to 'TRUE' or to
'FALSE'

This closes #55


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/2bc54060
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/2bc54060
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/2bc54060

Branch: refs/heads/master
Commit: 2bc54060a4aff2e01ecfdd0c1eaaeec52a39b738
Parents: 7b3606b
Author: George Kankava <george.kankava@devfactory.com>
Authored: Tue Jun 28 21:40:34 2016 +0400
Committer: John D. Ament <johndament@apache.org>
Committed: Wed Jul 13 00:01:20 2016 -0400

----------------------------------------------------------------------
 .../deltaspike/data/api/mapping/SimpleQueryInOutMapperBase.java | 5 +++--
 .../org/apache/deltaspike/data/impl/meta/RepositoryMethod.java  | 2 +-
 .../jsf/impl/component/window/WindowIdHtmlRenderer.java         | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/2bc54060/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/mapping/SimpleQueryInOutMapperBase.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/mapping/SimpleQueryInOutMapperBase.java
b/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/mapping/SimpleQueryInOutMapperBase.java
index 874e535..e82fe31 100644
--- a/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/mapping/SimpleQueryInOutMapperBase.java
+++ b/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/mapping/SimpleQueryInOutMapperBase.java
@@ -73,15 +73,16 @@ public abstract class SimpleQueryInOutMapperBase<Entity, Dto> implements
QueryIn
     @Override
     public Object mapResultList(final List<Entity> result)
     {
-        final List<Object> mapped = new ArrayList<Object>(result.size());
         if (result != null)
         {
+            final List<Object> mapped = new ArrayList<Object>(result.size());
             for (final Entity a : result)
             {
                 mapped.add(mapResult(a));
             }
+            return mapped;
         }
-        return mapped;
+        return new ArrayList<Object>();
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/2bc54060/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/meta/RepositoryMethod.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/meta/RepositoryMethod.java
b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/meta/RepositoryMethod.java
index e349e56..0522b32 100644
--- a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/meta/RepositoryMethod.java
+++ b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/meta/RepositoryMethod.java
@@ -189,7 +189,7 @@ public class RepositoryMethod
             return;
         }
 
-        if (queryInOutMapperIsNormalScope != null && beanManager != null)
+        if (beanManager != null)
         {
             final Set<Bean<?>> beans = beanManager.getBeans(mapper);
             final Class<? extends Annotation> scope = beanManager.resolve(beans).getScope();

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/2bc54060/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/component/window/WindowIdHtmlRenderer.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/component/window/WindowIdHtmlRenderer.java
b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/component/window/WindowIdHtmlRenderer.java
index 755f0c6..ed2752d 100644
--- a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/component/window/WindowIdHtmlRenderer.java
+++ b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/component/window/WindowIdHtmlRenderer.java
@@ -88,7 +88,7 @@ public class WindowIdHtmlRenderer extends Renderer
                 + clientWindowConfig.isClientWindowStoreWindowTreeEnabledOnButtonClick());
 
         // see #729
-        if (!delegatedWindowMode && clientWindow.isInitialRedirectSupported(context))
+        if (clientWindow.isInitialRedirectSupported(context))
         {
             Object cookie = ClientWindowHelper.getRequestWindowIdCookie(context, windowId);
             if (cookie != null && cookie instanceof Cookie)


Mime
View raw message