| CODENOTIFIER | HelpYou are not signed inSign in |
Project: ICEFaces
Revision: 17507
Author: jack.van.ooststroom
Date: 05 Sep 2008 18:15:32
Changes:Fixed JIRA ICE-3488 : Possible null value in group set of GroupAsyncRenderer
Files:| ... | ...@@ -69,7 +69,7 @@ | |
| 69 | 69 | * @see RenderManager, OnDemandRenderer, IntervalRenderer, DelayRenderer |
| 70 | 70 | */ |
| 71 | 71 | public class GroupAsyncRenderer |
| 72 | implements AsyncRenderer { | |
| 72 | implements AsyncRenderer { | |
| 73 | 73 | private static final Log LOG = LogFactory.getLog(GroupAsyncRenderer.class); |
| 74 | 74 | |
| 75 | 75 | protected final Set group = new CopyOnWriteArraySet(); |
| ... | ...@@ -91,7 +91,7 @@ | |
| 91 | 91 | * @param renderable the Renderable instance to add to the group. |
| 92 | 92 | */ |
| 93 | 93 | public void add(final Renderable renderable) { |
| 94 | add((Object) renderable); | |
| 94 | add((Object)renderable); | |
| 95 | 95 | } |
| 96 | 96 | |
| 97 | 97 | /** |
| ... | ...@@ -104,7 +104,7 @@ | |
| 104 | 104 | public void addCurrentSession() { |
| 105 | 105 | FacesContext facesContext = FacesContext.getCurrentInstance(); |
| 106 | 106 | if (facesContext != null) { |
| 107 | add(facesContext.getExternalContext().getSession(false)); | |
| 107 | add(facesContext.getExternalContext().getSession(true)); | |
| 108 | 108 | } |
| 109 | 109 | } |
| 110 | 110 | |
| ... | ...@@ -119,14 +119,14 @@ | |
| 119 | 119 | } |
| 120 | 120 | |
| 121 | 121 | public boolean contains(final Renderable renderable) { |
| 122 | return contains((Object) renderable); | |
| 122 | return contains((Object)renderable); | |
| 123 | 123 | } |
| 124 | 124 | |
| 125 | 125 | public boolean containsCurrentSession() { |
| 126 | 126 | FacesContext facesContext = FacesContext.getCurrentInstance(); |
| 127 | 127 | return |
| 128 | facesContext != null && | |
| 129 | contains(facesContext.getExternalContext().getSession(false)); | |
| 128 | facesContext != null && | |
| 129 | contains(facesContext.getExternalContext().getSession(false)); | |
| 130 | 130 | } |
| 131 | 131 | |
| 132 | 132 | /** |
| ... | ...@@ -168,7 +168,7 @@ | |
| 168 | 168 | * @param renderable the Renderable instance to remove |
| 169 | 169 | */ |
| 170 | 170 | public void remove(final Renderable renderable) { |
| 171 | remove((Object) renderable); | |
| 171 | remove((Object)renderable); | |
| 172 | 172 | } |
| 173 | 173 | |
| 174 | 174 | /** |
| ... | ...@@ -231,17 +231,17 @@ | |
| 231 | 231 | * constructed and does not support the mutative remove operation! |
| 232 | 232 | */ |
| 233 | 233 | if (StaticTimerUtility.Log.isTraceEnabled()) { |
| 234 | StaticTimerUtility.newJob( group.size() ); | |
| 234 | StaticTimerUtility.newJob(group.size()); | |
| 235 | 235 | StaticTimerUtility.startJobTmer(); |
| 236 | 236 | } |
| 237 | for (Iterator i = group.iterator(); !stopRequested && i.hasNext();) { | |
| 238 | Object object = ((WeakReference) i.next()).get(); | |
| 237 | for (Iterator i = group.iterator(); !stopRequested && i.hasNext(); ) { | |
| 238 | Object object = ((WeakReference)i.next()).get(); | |
| 239 | 239 | if (object instanceof Renderable) { |
| 240 | requestRender((Renderable) object); | |
| 240 | requestRender((Renderable)object); | |
| 241 | 241 | } else if (object instanceof HttpSession) { |
| 242 | requestRender((HttpSession) object); | |
| 242 | requestRender((HttpSession)object); | |
| 243 | 243 | } else if (object instanceof PortletSession) { |
| 244 | requestRender((PortletSession) object); | |
| 244 | requestRender((PortletSession)object); | |
| 245 | 245 | } |
| 246 | 246 | } |
| 247 | 247 | } |
| ... | ...@@ -264,8 +264,8 @@ | |
| 264 | 264 | } |
| 265 | 265 | |
| 266 | 266 | private boolean contains(final Object object) { |
| 267 | for (Iterator i = group.iterator(); i.hasNext();) { | |
| 268 | if (object == ((WeakReference) i.next()).get()) { | |
| 267 | for (Iterator i = group.iterator(); i.hasNext(); ) { | |
| 268 | if (object == ((WeakReference)i.next()).get()) { | |
| 269 | 269 | return true; |
| 270 | 270 | } |
| 271 | 271 | } |
| ... | ...@@ -293,8 +293,8 @@ | |
| 293 | 293 | private void remove(final Object object) { |
| 294 | 294 | // todo: remove synchronized block as CopyOnWriteArraySet is used? |
| 295 | 295 | synchronized (group) { |
| 296 | for (Iterator i = group.iterator(); i.hasNext();) { | |
| 297 | WeakReference reference = (WeakReference) i.next(); | |
| 296 | for (Iterator i = group.iterator(); i.hasNext(); ) { | |
| 297 | WeakReference reference = (WeakReference)i.next(); | |
| 298 | 298 | if (object == reference.get()) { |
| 299 | 299 | group.remove(reference); |
| 300 | 300 | if (LOG.isTraceEnabled()) { |
| ... | ...@@ -347,32 +347,32 @@ | |
| 347 | 347 | suppressedViewState = null; |
| 348 | 348 | } |
| 349 | 349 | for ( |
| 350 | Iterator i = | |
| 351 | ((MainSessionBoundServlet) | |
| 352 | SessionDispatcher. | |
| 353 | getSingletonSessionServer(sessionId, applicationMap)). | |
| 354 | getViews().values().iterator(); | |
| 355 | i.hasNext(); | |
| 356 | ) { | |
| 350 | Iterator i = | |
| 351 | ((MainSessionBoundServlet) | |
| 352 | SessionDispatcher. | |
| 353 | getSingletonSessionServer(sessionId, applicationMap)). | |
| 354 | getViews().values().iterator(); | |
| 355 | i.hasNext(); | |
| 356 | ) { | |
| 357 | 357 | |
| 358 | 358 | final PersistentFacesState viewState = |
| 359 | ((View) i.next()).getPersistentFacesState(); | |
| 359 | ((View) i.next()).getPersistentFacesState(); | |
| 360 | 360 | if (viewState != suppressedViewState) { |
| 361 | 361 | requestRender( |
| 362 | new Renderable() { | |
| 363 | public PersistentFacesState getState() { | |
| 364 | return viewState; | |
| 365 | } | |
| 366 | ||
| 367 | public void renderingException( | |
| 368 | final RenderingException renderingException) { | |
| 369 | ||
| 370 | /* | |
| 371 | * It's up to our View infrastructure to remove | |
| 372 | * dead views. | |
| 373 | */ | |
| 374 | } | |
| 362 | new Renderable() { | |
| 363 | public PersistentFacesState getState() { | |
| 364 | return viewState; | |
| 375 | 365 | } |
| 366 | ||
| 367 | public void renderingException( | |
| 368 | final RenderingException renderingException) { | |
| 369 | ||
| 370 | /* | |
| 371 | * It's up to our View infrastructure to remove | |
| 372 | * dead views. | |
| 373 | */ | |
| 374 | } | |
| 375 | } | |
| 376 | 376 | ); |
| 377 | 377 | } |
| 378 | 378 | } |