You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@wicket.apache.org by Martijn Dashorst <ma...@gmail.com> on 2014/01/14 22:42:46 UTC
Re: git commit: WICKET-5472 PackageResource#internalGetResourceStream()
should return ProcessingResourceStream only when the resource is existing
Does this warrant a 6.13.1? Or is it innocent enough to be able to
wait for 6.14 (which will be built in about 3 weeks).
Martijn
On Tue, Jan 14, 2014 at 10:22 PM, <mg...@apache.org> wrote:
> Updated Branches:
> refs/heads/master e96dab080 -> c2b49a6cb
>
>
> WICKET-5472 PackageResource#internalGetResourceStream() should return ProcessingResourceStream only when the resource is existing
>
> (cherry picked from commit 1cc56f56aedbb9f0da0c6e1df35a441106568e72)
>
>
> Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
> Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/c2b49a6c
> Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/c2b49a6c
> Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/c2b49a6c
>
> Branch: refs/heads/master
> Commit: c2b49a6cb0748664119c2279e5556d3874ced59b
> Parents: e96dab0
> Author: Martin Tzvetanov Grigorov <mg...@apache.org>
> Authored: Tue Jan 14 23:22:05 2014 +0200
> Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
> Committed: Tue Jan 14 23:22:28 2014 +0200
>
> ----------------------------------------------------------------------
> .../org/apache/wicket/request/resource/PackageResource.java | 6 +++++-
> .../org/apache/wicket/util/resource/ResourceStreamWrapper.java | 2 +-
> 2 files changed, 6 insertions(+), 2 deletions(-)
> ----------------------------------------------------------------------
>
>
> http://git-wip-us.apache.org/repos/asf/wicket/blob/c2b49a6c/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResource.java
> ----------------------------------------------------------------------
> diff --git a/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResource.java b/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResource.java
> index ad03e22..dd23147 100644
> --- a/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResource.java
> +++ b/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResource.java
> @@ -461,7 +461,11 @@ public class PackageResource extends AbstractResource implements IStaticCacheabl
> ". See IPackageResourceGuard");
> }
>
> - return new ProcessingResourceStream(resourceStream);
> + if (resourceStream != null)
> + {
> + resourceStream = new ProcessingResourceStream(resourceStream);
> + }
> + return resourceStream;
> }
>
> /**
>
> http://git-wip-us.apache.org/repos/asf/wicket/blob/c2b49a6c/wicket-util/src/main/java/org/apache/wicket/util/resource/ResourceStreamWrapper.java
> ----------------------------------------------------------------------
> diff --git a/wicket-util/src/main/java/org/apache/wicket/util/resource/ResourceStreamWrapper.java b/wicket-util/src/main/java/org/apache/wicket/util/resource/ResourceStreamWrapper.java
> index 8b78be3..11b6253 100644
> --- a/wicket-util/src/main/java/org/apache/wicket/util/resource/ResourceStreamWrapper.java
> +++ b/wicket-util/src/main/java/org/apache/wicket/util/resource/ResourceStreamWrapper.java
> @@ -36,7 +36,7 @@ public class ResourceStreamWrapper implements IResourceStream
> this.delegate = Args.notNull(delegate, "delegate");
> }
>
> - protected IResourceStream getDelegate()
> + public IResourceStream getDelegate()
> {
> return delegate;
> }
>
--
Become a Wicket expert, learn from the best: http://wicketinaction.com
Re: git commit: WICKET-5472 PackageResource#internalGetResourceStream()
should return ProcessingResourceStream only when the resource is existing
Posted by Martin Grigorov <mg...@apache.org>.
I wasn't able to reproduce this problem with any of my apps.
Other Wicket devs who voted +1 seems didn't face such problem too.
One of the threads in users@ had a clear stacktrace showing this problem.
I want to see whether the second thread (the one related to
wicket-bootstrap) is also caused by this.
Martin Grigorov
Wicket Training and Consulting
On Tue, Jan 14, 2014 at 11:42 PM, Martijn Dashorst <
martijn.dashorst@gmail.com> wrote:
> Does this warrant a 6.13.1? Or is it innocent enough to be able to
> wait for 6.14 (which will be built in about 3 weeks).
>
> Martijn
>
> On Tue, Jan 14, 2014 at 10:22 PM, <mg...@apache.org> wrote:
> > Updated Branches:
> > refs/heads/master e96dab080 -> c2b49a6cb
> >
> >
> > WICKET-5472 PackageResource#internalGetResourceStream() should return
> ProcessingResourceStream only when the resource is existing
> >
> > (cherry picked from commit 1cc56f56aedbb9f0da0c6e1df35a441106568e72)
> >
> >
> > Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
> > Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/c2b49a6c
> > Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/c2b49a6c
> > Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/c2b49a6c
> >
> > Branch: refs/heads/master
> > Commit: c2b49a6cb0748664119c2279e5556d3874ced59b
> > Parents: e96dab0
> > Author: Martin Tzvetanov Grigorov <mg...@apache.org>
> > Authored: Tue Jan 14 23:22:05 2014 +0200
> > Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
> > Committed: Tue Jan 14 23:22:28 2014 +0200
> >
> > ----------------------------------------------------------------------
> > .../org/apache/wicket/request/resource/PackageResource.java | 6
> +++++-
> > .../org/apache/wicket/util/resource/ResourceStreamWrapper.java | 2 +-
> > 2 files changed, 6 insertions(+), 2 deletions(-)
> > ----------------------------------------------------------------------
> >
> >
> >
> http://git-wip-us.apache.org/repos/asf/wicket/blob/c2b49a6c/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResource.java
> > ----------------------------------------------------------------------
> > diff --git
> a/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResource.java
> b/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResource.java
> > index ad03e22..dd23147 100644
> > ---
> a/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResource.java
> > +++
> b/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResource.java
> > @@ -461,7 +461,11 @@ public class PackageResource extends
> AbstractResource implements IStaticCacheabl
> > ". See
> IPackageResourceGuard");
> > }
> >
> > - return new ProcessingResourceStream(resourceStream);
> > + if (resourceStream != null)
> > + {
> > + resourceStream = new
> ProcessingResourceStream(resourceStream);
> > + }
> > + return resourceStream;
> > }
> >
> > /**
> >
> >
> http://git-wip-us.apache.org/repos/asf/wicket/blob/c2b49a6c/wicket-util/src/main/java/org/apache/wicket/util/resource/ResourceStreamWrapper.java
> > ----------------------------------------------------------------------
> > diff --git
> a/wicket-util/src/main/java/org/apache/wicket/util/resource/ResourceStreamWrapper.java
> b/wicket-util/src/main/java/org/apache/wicket/util/resource/ResourceStreamWrapper.java
> > index 8b78be3..11b6253 100644
> > ---
> a/wicket-util/src/main/java/org/apache/wicket/util/resource/ResourceStreamWrapper.java
> > +++
> b/wicket-util/src/main/java/org/apache/wicket/util/resource/ResourceStreamWrapper.java
> > @@ -36,7 +36,7 @@ public class ResourceStreamWrapper implements
> IResourceStream
> > this.delegate = Args.notNull(delegate, "delegate");
> > }
> >
> > - protected IResourceStream getDelegate()
> > + public IResourceStream getDelegate()
> > {
> > return delegate;
> > }
> >
>
>
>
> --
> Become a Wicket expert, learn from the best: http://wicketinaction.com
>