[felix-dev] branch FELIX-6442 updated (fe6799c -> 7a0cce3)

[cz...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

cziegeler pushed a change to branch FELIX-6442
in repository https://gitbox.apache.org/repos/asf/felix-dev.git.


 discard fe6799c  FELIX-6442 : NPE when generating ServiceReferenceDTOs
    omit 72c9f17  FELIX-6442 : NPE when generating ServiceReferenceDTOs
     add 53490bf  FELIX-6442 : NPE when generating ServiceReferenceDTOs (#86)
     add cf2cf3c  Introduced thread-safety while updating field during deactivation phase
     add 6695a8a  Merge pull request #81 from amitjoy/bug/FELIX-6439/npe-treemap
     add 7a0cce3  FELIX-6442 : NPE when generating ServiceReferenceDTOs

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (fe6799c)
            \
             N -- N -- N   refs/heads/FELIX-6442 (7a0cce3)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

No new revisions were added by this update.

Summary of changes:
 .../apache/felix/scr/impl/inject/field/FieldHandler.java | 16 ++++++++++------
 .../felix/scr/impl/manager/ComponentContextImpl.java     | 13 ++-----------
 2 files changed, 12 insertions(+), 17 deletions(-)