Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FELIX-6086: Correct key for FELIX_JETTY_SESSION_SCAVENGING_INTERVAL #190

Open
wants to merge 10,000 commits into
base: trunk
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
10000 commits
Select commit Hold shift + click to select a range
64d677e
Configure baselone on dependency manager r12 artifacts
Oct 22, 2018
9867bb0
[felix] remove top level reactor since it doesn't work, fix the readme
rotty3000 Oct 30, 2018
b5367f5
[felix] remove redundant header. Yes it's a README... we get it!
rotty3000 Oct 31, 2018
efdbeeb
FELIX-5974 : Prototype scope references are not released on deactivat…
cziegeler Nov 3, 2018
083a32d
FELIX-5978: Ensure getClassLoader() is called in a safe way when secu…
karlpauls Nov 8, 2018
91800a1
Remove some bogus imports.
karlpauls Nov 8, 2018
dbe6659
Update changelog
cziegeler Nov 9, 2018
27d70d1
[maven-release-plugin] prepare release org.apache.felix.scr-2.1.14
cziegeler Nov 9, 2018
2386e1b
[maven-release-plugin] prepare for next development iteration
cziegeler Nov 9, 2018
c41d986
[maven-release-plugin] prepare release org.apache.felix.scr-2.1.14
cziegeler Nov 10, 2018
f414ec9
[maven-release-plugin] prepare for next development iteration
cziegeler Nov 10, 2018
aac602f
FELIX-5934 : The Felix Web Console stores unsalted hashed password. A…
cziegeler Nov 13, 2018
b0a5f2a
[maven-release-plugin] prepare release org.apache.felix.configurator-…
cziegeler Nov 15, 2018
8c43fe9
[maven-release-plugin] prepare for next development iteration
cziegeler Nov 15, 2018
1ec4317
FELIX-5989 - Avoid passing null arguments for formating debug messages
tjwatson Nov 26, 2018
8af6bd0
FELIX-5990: DM ServiceTracker memory leak
Nov 28, 2018
0d8e3bb
FELIX-5990: DM ServiceTracker memory leak
Nov 28, 2018
cb5c344
Adapted .classpath for Eclipse Photon
Nov 28, 2018
5167f9e
FELIX-5991: DM annotation scanner debug messages are logged in warn
Nov 28, 2018
887dac5
Updated changelog for r14 release.
Nov 28, 2018
89080d2
Updated dm release to r14
Nov 28, 2018
ddfa4b7
updated changelogs
Nov 28, 2018
7398072
FELIX-5992: Do not use a global changelog for all dm modules
Nov 28, 2018
ef62062
FELIX-5992: Do not use a global changelog for all dm modules
Nov 28, 2018
a523e7c
FELIX-5992: Do not use a global changelog for all dm modules
Nov 28, 2018
d827a47
Include workspace changelog in binary zip distribution
Nov 28, 2018
08deb2a
removed unexpected java9 runee
Nov 28, 2018
c1a4dd9
added --no-daemon option when calling gradlew
Nov 28, 2018
7d1e6f8
FELIX-5987: Slow ServiceComponentRuntime with delivering ServiceRefer…
karlpauls Nov 30, 2018
010e7fd
configure baseline on dm r14 artifacts
Dec 2, 2018
9678534
FELIX-5995: stop the whiteboardManager before the httpServiceFactory …
karlpauls Dec 3, 2018
f4892ed
FELIX-5994: resolve endpoint properties if host is 0.0.0.0
karlpauls Dec 3, 2018
6462c41
Fix typo in BlacklistLatch Log warning. This closes #163
jbonofre Dec 7, 2018
08d52b4
[FELIX-5997] Remove hashcode and equals from AbstractCapabilityRequir…
jbonofre Dec 11, 2018
7fe9c9a
Update changelog.txt
jbonofre Dec 11, 2018
c8ed1ff
[maven-release-plugin] prepare release org.apache.felix.utils-1.11.2
jbonofre Dec 11, 2018
0e167b6
[maven-release-plugin] prepare for next development iteration
jbonofre Dec 11, 2018
d3bda36
FELIX-5952 Initial commit of Felix Health Checks (as contributed by s…
ghenzler Dec 18, 2018
5838f85
FELIX-5952 removing folders imported invalidly to root location
ghenzler Dec 18, 2018
33f4074
FELIX-5952 Initial commit of Felix Health Checks (as contributed by s…
ghenzler Dec 18, 2018
5fe02e3
FELIX-5996: Remove generic parameter in DM Component interface
Dec 19, 2018
1bfa7b5
FELIX-5999 cleanup compiler warnings
rotty3000 Dec 19, 2018
33dc64c
FELIX-5970 Add requirement & capabilities model so gogo can be resolved
rotty3000 Dec 19, 2018
dd97ec4
FELIX-6002 Remove legacy code in Gogo Command
rotty3000 Dec 19, 2018
04b348a
FELIX-6003 Add some resolver checks to make sure @RequireGogo annotat…
rotty3000 Dec 19, 2018
3fb8394
FELIX-6006 errorHandler not consulted for conversions implemented via…
bosschaert Dec 20, 2018
2a75d37
FELIX-6006 errorHandler not consulted for conversions implemented via…
bosschaert Dec 20, 2018
954313f
Move to felix-parent version 6
bosschaert Dec 21, 2018
a8a266e
FELIX-6006 errorHandler not consulted for conversions implemented via…
bosschaert Dec 21, 2018
313edc9
[gogo] some minor cleanup
rotty3000 Dec 21, 2018
50fb0ba
FELIX-5970 follow up work, fix anno package name, add cap&req version…
rotty3000 Dec 21, 2018
25e5600
FELIX-6007 create a gogo bom
rotty3000 Dec 21, 2018
6909913
[gogo] update ignores
rotty3000 Dec 21, 2018
e408415
[gogo] fix javadoc errors
rotty3000 Dec 21, 2018
6bf1944
[gogo] fix deployment error
rotty3000 Dec 21, 2018
34d0e7e
prepare for next r16 release.
Dec 24, 2018
c536a34
FELIX-5952 svn ignores
ghenzler Dec 28, 2018
ae85677
Fix typo in comment
cziegeler Jan 2, 2019
0cccad5
FELIX-6004 Component property type annotations for health checks
ghenzler Jan 3, 2019
24f20af
FELIX-6004 svn ignore
ghenzler Jan 3, 2019
820ca62
FELIX-5952 various improvements
ghenzler Jan 3, 2019
39bf85c
[gogo] update changelogs
rotty3000 Jan 3, 2019
0d6d237
[gogo] release:prepare can't update a property it seems
rotty3000 Jan 3, 2019
1031c2f
[maven-release-plugin] prepare release gogo-parent-5
rotty3000 Jan 3, 2019
48be75b
[maven-release-plugin] prepare for next development iteration
rotty3000 Jan 3, 2019
c64a0a7
[maven-release-plugin] prepare release org.apache.felix.gogo.runtime-…
rotty3000 Jan 3, 2019
2928801
[maven-release-plugin] prepare for next development iteration
rotty3000 Jan 3, 2019
eea3ab8
[maven-release-plugin] prepare release org.apache.felix.gogo.jline-1.1.2
rotty3000 Jan 3, 2019
29a76c2
[maven-release-plugin] prepare for next development iteration
rotty3000 Jan 3, 2019
6c11f6d
[maven-release-plugin] prepare release org.apache.felix.gogo.shell-1.1.2
rotty3000 Jan 3, 2019
5bbe51d
[maven-release-plugin] prepare for next development iteration
rotty3000 Jan 3, 2019
b271a1b
[maven-release-plugin] prepare release org.apache.felix.gogo.command-…
rotty3000 Jan 3, 2019
5f89ed8
[maven-release-plugin] prepare for next development iteration
rotty3000 Jan 3, 2019
97738c2
[maven-release-plugin] prepare release org.apache.felix.gogo.bom-1.0.0
rotty3000 Jan 3, 2019
c46d9e0
[maven-release-plugin] prepare for next development iteration
rotty3000 Jan 3, 2019
af4766b
[gogo] fix versions in BOM
rotty3000 Jan 3, 2019
6d5e585
[maven-release-plugin] prepare release org.apache.felix.gogo.bom-1.0.0
rotty3000 Jan 3, 2019
87116aa
[maven-release-plugin] prepare for next development iteration
rotty3000 Jan 3, 2019
d129c74
[maven-release-plugin] prepare release org.apache.felix.gogo.jline-1.1.2
rotty3000 Jan 4, 2019
00e4e14
[maven-release-plugin] prepare for next development iteration
rotty3000 Jan 4, 2019
c18c218
[maven-release-plugin] prepare release org.apache.felix.gogo.bom-1.0.0
rotty3000 Jan 4, 2019
ed49fed
[maven-release-plugin] prepare for next development iteration
rotty3000 Jan 4, 2019
7461637
[maven-release-plugin] prepare release org.apache.felix.gogo.bom-1.0.2
rotty3000 Jan 4, 2019
65265ec
[maven-release-plugin] rollback the release of org.apache.felix.gogo.…
rotty3000 Jan 4, 2019
9b8229f
[maven-release-plugin] prepare release org.apache.felix.gogo.bom-1.0.2
rotty3000 Jan 4, 2019
c1dd80c
[maven-release-plugin] rollback the release of org.apache.felix.gogo.…
rotty3000 Jan 4, 2019
53d6b5e
[gogo] fix bas scm urls in BOM
rotty3000 Jan 4, 2019
3b0d27c
[maven-release-plugin] prepare release org.apache.felix.gogo.bom-1.0.2
rotty3000 Jan 4, 2019
615385a
[maven-release-plugin] prepare for next development iteration
rotty3000 Jan 4, 2019
14d9989
FELIX-6005 Introduce result status TEMPORARILY_UNAVAILABLE for health…
ghenzler Jan 4, 2019
9f1c966
FELIX-6010 Allow multiple instances of HC servlets with configured pr…
ghenzler Jan 4, 2019
d1732cc
FELIX-6011 Introduce tag "default" to be used if no tags are passed t…
ghenzler Jan 4, 2019
6f8af3d
FELIX-5952 removed obsolete felix SCR plugin
ghenzler Jan 4, 2019
7447b7a
FELIX-6012 Introduce module "generalchecks" with basic general purpos…
ghenzler Jan 4, 2019
cb3c5a5
FELIX-6012 svn:ignore
ghenzler Jan 4, 2019
cb760c7
FELIX-6012 general purpose checks documentation
ghenzler Jan 4, 2019
269ed3d
ensure newlines are properly escaped (to not produce invalid JSON res…
ghenzler Jan 4, 2019
e9c7b18
FELIX-6012 Moving JMX Attribute check to module generalchecks
ghenzler Jan 5, 2019
ebff340
FELIX-6012 fixed name/description of config property
ghenzler Jan 7, 2019
eaaca9d
FELIX-6012 improved config property descriptions for includes/excludes
ghenzler Jan 7, 2019
103a57d
FELIX-6011 improved documentation on web console form page
ghenzler Jan 7, 2019
b4d1beb
FELIX-6016 Moving HealthCheckFilter to bundle org.apache.felix.health…
ghenzler Jan 8, 2019
f922fbd
FELIX-6016 Moved HealthCheckMetadata to package org.apache.felix.hc.a…
ghenzler Jan 8, 2019
5889697
FELIX-6016 Moved FormattingResultLog to package org.apache.felix.hc.api
ghenzler Jan 8, 2019
0d033a0
FELIX-6012 made JmxAttributeCheck more flexible (more contraints, mul…
ghenzler Jan 9, 2019
cd47fe4
FELIX-5952 improved naming for sticky results
ghenzler Jan 9, 2019
302649e
FELIX-5952 Allow chaining of setters for easier usage (fully backward…
ghenzler Jan 9, 2019
4341a2e
FELIX-5952 General improvements/fixes
ghenzler Jan 9, 2019
c678360
FELIX-5952 General improvements/fixes (missing file of last commit)
ghenzler Jan 9, 2019
540779b
FELIX-6017 New AdhocResultDuringRequestProcessingFilter (e.g. useful …
ghenzler Jan 9, 2019
a16c60e
FELIX-6018 Servlet Filter to answer arbitrary http requests with 503 …
ghenzler Jan 9, 2019
f6554cb
FELIX-6024 Generic check HttpRequestsCheck
ghenzler Jan 10, 2019
2d69aae
FELIX-6027 Embed jul-to-slf4j bridge because who doesn't want jul fix…
rotty3000 Jan 14, 2019
8f0027e
[logback] massive simplifications to tests
rotty3000 Jan 14, 2019
f283e79
[maven-release-plugin] prepare release org.apache.felix.logback-1.0.2
rotty3000 Jan 15, 2019
72927e7
[maven-release-plugin] prepare for next development iteration
rotty3000 Jan 15, 2019
4c00335
FELIX-5952 fixed url to HC executor config
ghenzler Jan 16, 2019
0613af6
FELIX-6023 bnd scrplugin preserve sequence of classpath entries (appl…
stefanseifert Jan 17, 2019
076c577
switch back to release version of scr.generator
stefanseifert Jan 17, 2019
988a7ab
[gogo] fixup itest builds
rotty3000 Jan 17, 2019
bf5ec42
FELIX-6025 ScriptedHealthCheck initial version
ghenzler Jan 17, 2019
d642d3c
FELIX-5952 ensure toString() of Result shows DEBUG for isDebug=true
ghenzler Jan 18, 2019
6a24aed
FELIX-5952 slightly better error handling
ghenzler Jan 18, 2019
b9a86a7
FELIX-6031 Converter is not working properly when the target is an in…
bosschaert Jan 18, 2019
36a2613
FELIX-6017 Better config key names for after processing checks
ghenzler Jan 18, 2019
3d13128
[FELIX-5963] This closes #168
jbonofre Jan 22, 2019
894c4e7
[FELIX-5968] This closes #158
jbonofre Jan 22, 2019
40027df
[FELIX-6030] This closes #167
jbonofre Jan 22, 2019
28ed0d0
[FELIX-6033] This closes #166
jbonofre Jan 22, 2019
28cc668
prepare release 1.9.2
stefanseifert Jan 23, 2019
8f59042
[maven-release-plugin] prepare release org.apache.felix.scr.bnd-1.9.2
stefanseifert Jan 23, 2019
24e7cda
[maven-release-plugin] prepare for next development iteration
stefanseifert Jan 23, 2019
b113094
FELIX-6035: preload the jrt handler on URLHandlers init using the URL…
karlpauls Jan 23, 2019
213c848
[maven-release-plugin] prepare release org.apache.felix.gogo.jline-1.1.4
jbonofre Jan 25, 2019
6a62ad6
[maven-release-plugin] prepare for next development iteration
jbonofre Jan 25, 2019
9b2643c
FELIX-6036 - avoid stashing stale RefPair objects in OpenStatus
tjwatson Jan 25, 2019
2e27a28
FELIX-6025 ScriptedHealthCheck - refactoring to allow reuse in sling
ghenzler Jan 25, 2019
9726fe3
FELIX-6026 - Fix ScrInfo service issues
tjwatson Jan 25, 2019
3df31cd
FELIX-5952 LICENSE files
ghenzler Jan 28, 2019
315fe16
[maven-release-plugin] prepare release org.apache.felix.healthcheck.a…
ghenzler Jan 28, 2019
7f3a209
[maven-release-plugin] prepare for next development iteration
ghenzler Jan 28, 2019
5e25299
[maven-release-plugin] prepare release org.apache.felix.healthcheck.a…
ghenzler Jan 28, 2019
be582ba
[maven-release-plugin] prepare for next development iteration
ghenzler Jan 28, 2019
8077613
FELIX-5952 Updating to non-SNAPSHOT dependencies before release
ghenzler Jan 28, 2019
3bd0411
[maven-release-plugin] prepare release org.apache.felix.healthcheck.c…
ghenzler Jan 28, 2019
325427b
[maven-release-plugin] prepare for next development iteration
ghenzler Jan 28, 2019
3899024
FELIX-6012 Fixed javadoc
ghenzler Jan 28, 2019
8800ea5
[maven-release-plugin] prepare release org.apache.felix.healthcheck.g…
ghenzler Jan 28, 2019
c8f9ca6
FELIX-6012 Fixed scm section and reset to last SNAPSHOT
ghenzler Jan 28, 2019
17e375c
[maven-release-plugin] prepare release org.apache.felix.healthcheck.g…
ghenzler Jan 28, 2019
7427f7c
[maven-release-plugin] prepare for next development iteration
ghenzler Jan 28, 2019
6933106
[maven-release-plugin] prepare release org.apache.felix.healthcheck.w…
ghenzler Jan 28, 2019
a99ff61
[maven-release-plugin] prepare for next development iteration
ghenzler Jan 28, 2019
32aca48
Update changelog for release
karlpauls Jan 28, 2019
272852a
[maven-release-plugin] prepare release org.apache.felix.framework-6.0.2
karlpauls Jan 28, 2019
56f4d1f
[maven-release-plugin] prepare for next development iteration
karlpauls Jan 28, 2019
1aa7e1b
Update changelog for release
karlpauls Jan 28, 2019
ff5495e
[maven-release-plugin] prepare release org.apache.felix.main-6.0.2
karlpauls Jan 28, 2019
a522471
[maven-release-plugin] prepare for next development iteration
karlpauls Jan 28, 2019
befe065
Update changelog and dependencies for release
karlpauls Jan 28, 2019
46ed4df
[maven-release-plugin] prepare release org.apache.felix.main.distribu…
karlpauls Jan 28, 2019
b280b40
[maven-release-plugin] prepare for next development iteration
karlpauls Jan 28, 2019
e8f9f27
Fix release version in changelog
karlpauls Jan 28, 2019
0425672
FELIX-6041 - allow scr commands to work when gogo.runtime resolves later
tjwatson Jan 29, 2019
ddc6f23
Add a capability advertising that the HttpService is provided by this…
timothyjward Jan 30, 2019
1184d28
FELIX-6042 Lists are not recognized as typed properties
bosschaert Jan 31, 2019
4f85d9c
FELIX-6038: pull Java 7 support back in for gogo runtime,shell and co…
tjwatson Feb 5, 2019
397478a
Remove unused import
tjwatson Feb 5, 2019
cbf47ba
FELIX-6046 - fix gogo shell thread interrupt.
tjwatson Feb 5, 2019
dcdfd64
FELIX-6044 - Fixes for maintaining correct reference usage
tjwatson Feb 5, 2019
725cfda
FELIX-6043 - depend on R7 packages for promise and function
tjwatson Feb 5, 2019
0873253
FELIX-6049 : Listeners registered with boolean property are ignored
cziegeler Feb 7, 2019
4f97764
FELIX-6050 - Use common code for PrototypRefPair
tjwatson Feb 7, 2019
7ce2b82
WORKING - fix NPE on ServiceRef.getBundle
tjwatson Feb 7, 2019
306df37
FELIX-6054 use getTitle() for json and verbose.txt serializers (same …
ghenzler Feb 7, 2019
e043fcc
FELIX-6052 Ensure MBeans are registered for legacy checks as well and…
Feb 8, 2019
fb42442
FELIX-6053 Ensure JMX bean shows DEBUG/INFO(=OK) correctly
Feb 8, 2019
7501bcf
Back to 2.0.0-SAPSHOTs (to avoid compilation problems)
Feb 8, 2019
ec6a665
FELIX-5952 Fixed baseline checks setup
Feb 10, 2019
725aeb5
FELIX-6056 - stop exporting promises and function
Feb 13, 2019
44cdf63
FELIX-6057 Converter doesn't properly handle PREFIX_ in marker annota…
Feb 13, 2019
2ab5663
[maven-release-plugin] prepare release org.apache.felix.converter-1.0.4
rotty3000 Feb 16, 2019
30c991a
[maven-release-plugin] prepare for next development iteration
rotty3000 Feb 16, 2019
fdda938
FELIX-6051: Add a registerBundle method and allow to disable autostar…
karlpauls Feb 18, 2019
f577877
FELIX-5952 moved markdown documentation to health check top level
ghenzler Feb 18, 2019
b475cd1
[maven-release-plugin] prepare release org.apache.felix.healthcheck.a…
ghenzler Feb 18, 2019
21feba2
[maven-release-plugin] prepare for next development iteration
ghenzler Feb 18, 2019
5e14c6d
[maven-release-plugin] prepare release org.apache.felix.healthcheck.a…
ghenzler Feb 18, 2019
12ae956
Back to 2.0.0-SAPSHOT after tagging problem during release
ghenzler Feb 18, 2019
7976e45
[maven-release-plugin] prepare release org.apache.felix.healthcheck.a…
ghenzler Feb 18, 2019
28e3542
[maven-release-plugin] prepare for next development iteration
ghenzler Feb 18, 2019
750a460
back to 2.0.0-SNAPSHOT after error during release
ghenzler Feb 18, 2019
e4a7c85
[maven-release-plugin] prepare release org.apache.felix.healthcheck.a…
ghenzler Feb 18, 2019
6be49df
back to 2.0.0-SNAPSHOT after error during release
ghenzler Feb 18, 2019
549c3a2
[maven-release-plugin] prepare release org.apache.felix.healthcheck.a…
ghenzler Feb 18, 2019
ddcfbc4
[maven-release-plugin] prepare for next development iteration
ghenzler Feb 18, 2019
2827286
Using api version 2.0.0
ghenzler Feb 18, 2019
93ba518
[maven-release-plugin] prepare release org.apache.felix.healthcheck.c…
ghenzler Feb 18, 2019
2ef9d64
[maven-release-plugin] prepare for next development iteration
ghenzler Feb 18, 2019
218d478
Using api/annotation version 2.0.0
ghenzler Feb 18, 2019
eb66d1c
[maven-release-plugin] prepare release org.apache.felix.healthcheck.g…
ghenzler Feb 18, 2019
997d23c
[maven-release-plugin] prepare for next development iteration
ghenzler Feb 18, 2019
9603069
Using api version 2.0.0
ghenzler Feb 18, 2019
ffe331e
[maven-release-plugin] prepare release org.apache.felix.healthcheck.w…
ghenzler Feb 18, 2019
690fd2e
[maven-release-plugin] prepare for next development iteration
ghenzler Feb 18, 2019
b22186f
FELIX-6062 : Coordination is not checked if its terminated
cziegeler Feb 19, 2019
81e5386
[FELIX-6061] Avoid using getDeclaredMethods which needs a permission …
timothyjward Feb 19, 2019
de565f5
Update changelog
tjwatson Feb 19, 2019
51c27af
Update changelog and adjust readme in pom
cziegeler Feb 19, 2019
6c94af0
Update changelog
tjwatson Feb 19, 2019
e3e13cd
FELIX-6063 Avoid using getDeclaredXXX() in the converter
timothyjward Feb 20, 2019
86166d9
Fix javadoc problems with java 8
cziegeler Feb 20, 2019
801f1f8
[maven-release-plugin] prepare release org.apache.felix.configadmin-1…
cziegeler Feb 20, 2019
6c6b97d
[maven-release-plugin] prepare for next development iteration
cziegeler Feb 20, 2019
44f2db3
FELIX-6064 Be lenient when converting from a DTO type with no public …
timothyjward Feb 20, 2019
d3183e8
[maven-release-plugin] prepare release org.apache.felix.scr-2.1.16
tjwatson Feb 20, 2019
73b86d3
[maven-release-plugin] prepare for next development iteration
tjwatson Feb 20, 2019
207a63c
FELIX-6065 Support the use of wildcard types in conversions
timothyjward Feb 20, 2019
647e17c
FELIX-6067: Make sure getService isn't failing if thread is interrupted.
karlpauls Feb 22, 2019
6f9c106
FELIX-6068 : Update Jetty to 9.4.15.v20190215
cziegeler Feb 25, 2019
5938a0e
FELIX-5995 : HttpService HttpServiceController should stop whiteboard…
cziegeler Feb 26, 2019
09b8ea7
FELIX-6047 : Delegate timezone and date format properties to Jetty. A…
cziegeler Feb 26, 2019
b06caa6
Prepare for release
cziegeler Feb 26, 2019
d7e9f97
[maven-release-plugin] prepare release org.apache.felix.http.base-4.0.6
cziegeler Feb 26, 2019
8ba1db3
[maven-release-plugin] prepare for next development iteration
cziegeler Feb 26, 2019
e1c33ac
[maven-release-plugin] prepare release org.apache.felix.http.jetty-4.0.8
cziegeler Feb 26, 2019
6ae62a0
[maven-release-plugin] prepare for next development iteration
cziegeler Feb 26, 2019
c92fb02
[maven-release-plugin] prepare release org.apache.felix.http.bridge-4…
cziegeler Feb 26, 2019
f979f72
[maven-release-plugin] prepare for next development iteration
cziegeler Feb 26, 2019
ad2aabb
Back to next snapshot after release
cziegeler Feb 26, 2019
99a2fe7
FELIX-6072 NPE fix
ghenzler Feb 27, 2019
e971b02
[FELIX-6074][FELIX-6075] Support plain incremental manifest build, u…
gnodet Feb 28, 2019
4857cb9
[FELIX-6075] Upgrade to JDK 8
gnodet Feb 28, 2019
e12e94c
[FELIX-6073] Upgrade to Maven 3
gnodet Feb 28, 2019
9487647
[FELIX-6074] Do not analyze dependencies before the upToDate check
gnodet Feb 28, 2019
2d559f6
[FELIX-6074] Do not write all stale files at info level
gnodet Mar 1, 2019
fbfdb29
[FELIX-6078] Add an option to silently ignore some project types inst…
gnodet Mar 4, 2019
acdb6dc
FELIX-6079: Web Console memory usage page does not display informatio…
karlpauls Mar 6, 2019
96a11a0
[maven-release-plugin] prepare release org.apache.felix.webconsole.pl…
karlpauls Mar 6, 2019
b4c40fc
[maven-release-plugin] prepare for next development iteration
karlpauls Mar 6, 2019
128a000
Update changelog
karlpauls Mar 6, 2019
6568668
[FELIX-6066] This closes #185
jbonofre Mar 7, 2019
b4a6b0d
[maven-release-plugin] prepare release org.apache.felix.configadmin-1…
jbonofre Mar 7, 2019
1f57326
[maven-release-plugin] prepare for next development iteration
jbonofre Mar 7, 2019
0370339
Add unit test for custom converter chaining.
bosschaert Mar 8, 2019
d5046d3
[Felix Converter] Improve thread safety by passing current converter …
bosschaert Mar 11, 2019
fc1f903
FELIX-6008 ErrorHandlers should be applied in reverse order
bosschaert Mar 11, 2019
54d0740
FELIX-6081 - Upgrade bndlib to 4.2.0 in order to properly calculate o…
gnodet Mar 12, 2019
a132994
FELIX-6083 NPE running systemready
dulvac Mar 21, 2019
fa524e9
Correct key for FELIX_JETTY_SESSION_SCAVENGING_INTERVAL
cchamplin Mar 21, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
FELIX-6044 - Fixes for maintaining correct reference usage
 - unget non-prototype service refs
 - avoid creating multiple prototype instances for same component

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1853021 13f79535-47bb-0310-9956-ffa450edef68
tjwatson committed Feb 5, 2019
commit dcdfd64b8c8cc33a90270d9c6b088d29bee8f180
Original file line number Diff line number Diff line change
@@ -41,6 +41,8 @@ public class ComponentServiceObjectsHelper

private final List<ComponentServiceObjectsImpl> closedServices = new ArrayList<ComponentServiceObjectsImpl>();

private final ConcurrentMap<ServiceReference<?>, Object> prototypeInstances = new ConcurrentHashMap<ServiceReference<?>, Object>();

public ComponentServiceObjectsHelper(final BundleContext bundleContext)
{
this.bundleContext = bundleContext;
@@ -63,6 +65,7 @@ public void cleanup()
{
cso.deactivate();
}
prototypeInstances.clear();
}

public ComponentServiceObjects getServiceObjects(final ServiceReference<?> ref)
@@ -98,7 +101,19 @@ public void closeServiceObjects(final ServiceReference<?> ref) {

public <T> T getPrototypeRefInstance(final ServiceReference<T> ref)
{
return (T) getServiceObjects(ref).getService();
T service = (T) prototypeInstances.get(ref);
if ( service == null )
{
service = (T) getServiceObjects(ref).getService();
T oldService = (T)prototypeInstances.putIfAbsent(ref, service);
if ( oldService != null )
{
// another thread created the instance already
getServiceObjects(ref).ungetService(service);
service = oldService;
}
}
return service;
}

private static final class ComponentServiceObjectsImpl implements ComponentServiceObjects
Original file line number Diff line number Diff line change
@@ -223,15 +223,7 @@ public void setPreviousRefMap(Map<ServiceReference<T>, RefPair<S, T>> previousRe

protected void ungetService(RefPair<S, T> ref)
{
Object service = ref.unsetServiceObject(null);
if (service != null)
{
BundleContext bundleContext = m_componentManager.getBundleContext();
if (bundleContext != null)
{
bundleContext.ungetService(ref.getRef());
}
}
ref.ungetServiceObjects(m_componentManager.getBundleContext());
}

protected void tracked(int trackingCount)
@@ -1690,7 +1682,7 @@ void close(ComponentContextImpl<S> componentContext, EdgeInfo edgeInfo)
invokeUnbindMethod(componentContext, boundRef, trackingCount.get(), edgeInfo);
}

boundRef.unsetServiceObject(componentContext);
boundRef.ungetServiceObject(componentContext);

}
latch.countDown();
Original file line number Diff line number Diff line change
@@ -54,7 +54,7 @@ public boolean setServiceObject(ComponentContextImpl<S> key, T serviceObject)
}

@Override
public T unsetServiceObject(ComponentContextImpl<S> key)
public T ungetServiceObject(ComponentContextImpl<S> key)
{
if ( key == null )
{
@@ -74,6 +74,11 @@ public T unsetServiceObject(ComponentContextImpl<S> key)
return service;
}

@Override
public void ungetServiceObjects(BundleContext bundleContext) {
ungetServiceObject(null);
}

@Override
public String toString()
{
@@ -83,7 +88,7 @@ public String toString()
@Override
public boolean getServiceObject(ComponentContextImpl<S> key, BundleContext context)
{
final T service = key.getComponentServiceObjectsHelper().getPrototypeRefInstance(this.getRef());
final T service = key.getComponentServiceObjectsHelper().getPrototypeRefInstance(this.getRef());
if ( service == null )
{
setFailed();
Original file line number Diff line number Diff line change
@@ -50,7 +50,8 @@ public ServiceReference<T> getRef()

public abstract boolean setServiceObject( ComponentContextImpl<S> key, T serviceObject );

public abstract T unsetServiceObject(ComponentContextImpl<S> key);
public abstract void ungetServiceObjects(BundleContext context);
public abstract T ungetServiceObject(ComponentContextImpl<S> key);

public void setFailed( )
{
Original file line number Diff line number Diff line change
@@ -161,7 +161,6 @@ protected void deleteComponent( final int reason )
{
m_useCount.set( 0 );
disposeImplementationObject( m_componentContext, reason );
m_componentContext.cleanup();
m_componentContext = null;
getLogger().log( LogService.LOG_DEBUG, "Unset and deconfigured implementation object for component in deleteComponent for reason {0}", null, REASONS[ reason ] );
clearServiceProperties();
@@ -417,7 +416,7 @@ protected void disposeImplementationObject( ComponentContextImpl<S> componentCon
md.close( componentContext, componentContext.getEdgeInfo( md ) );
}
}

componentContext.cleanup();
}

@Override
Original file line number Diff line number Diff line change
@@ -20,20 +20,64 @@

package org.apache.felix.scr.impl.manager;

import java.util.concurrent.atomic.AtomicReference;

import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
import org.osgi.service.log.LogService;

/**
* @version $Rev$ $Date$
*/
public class SinglePrototypeRefPair<S, T> extends SingleRefPair<S, T>
public class SinglePrototypeRefPair<S, T> extends RefPair<S, T>
{
class SingleKeyService {
final ComponentContextImpl<S> key;
final T serviceObject;
SingleKeyService(ComponentContextImpl<S> key, T serviceObject) {
this.key = key;
this.serviceObject = serviceObject;
}
}
protected AtomicReference<SingleKeyService> serviceObjectRef = new AtomicReference<>();

public SinglePrototypeRefPair( ServiceReference<T> ref )
{
super(ref);
}

@Override
public T getServiceObject(ComponentContextImpl<S> key)
{
SingleKeyService service = serviceObjectRef.get();
return service == null ? null : service.serviceObject;
}

@Override
public boolean setServiceObject(ComponentContextImpl<S> key, T serviceObject)
{
return serviceObjectRef.compareAndSet(null, new SingleKeyService(key, serviceObject ));
}

@Override
public T ungetServiceObject(ComponentContextImpl<S> key)
{
SingleKeyService service = serviceObjectRef.getAndSet(null);
if (service != null) {
if (key == null) {
key = service.key;
}
doUngetService(key, service.serviceObject);
return service.serviceObject;
}
return null;
}

@Override
public void ungetServiceObjects(BundleContext bundleContext) {
ungetServiceObject(null);
}

@Override
public String toString()
{
@@ -49,37 +93,25 @@ public boolean getServiceObject(ComponentContextImpl<S> key, BundleContext conte
setFailed();
key.getLogger().log(
LogService.LOG_WARNING,
"Could not get service from serviceobjects for ref {0}",null, getRef() );
"Could not get service from serviceobjects for ref {0}", null, getRef() );
return false;
}
if (!setServiceObject(key, service))
{
// Another thread got the service before, so unget our
doUngetService(key, service);
doUngetService( key, service );
}
return true;
}

@Override
public T unsetServiceObject(ComponentContextImpl<S> key)
{
final T service = super.unsetServiceObject(key);
if ( service != null )
{
doUngetService(key, service);
}
return null ;
}

private void doUngetService(ComponentContextImpl<S> key, final T service) {
try
{
key.getComponentServiceObjectsHelper().getServiceObjects(getRef()).ungetService(service);
key.getComponentServiceObjectsHelper().getServiceObjects(getRef()).ungetService( service );
}
catch (final IllegalStateException ise)
catch ( final IllegalStateException ise )
{
// ignore
}
}

}
Original file line number Diff line number Diff line change
@@ -31,7 +31,7 @@
*/
public class SingleRefPair<S, T> extends RefPair<S, T>
{
private AtomicReference<T> serviceObjectRef = new AtomicReference<>();
protected AtomicReference<T> serviceObjectRef = new AtomicReference<>();

public SingleRefPair( ServiceReference<T> ref )
{
@@ -56,9 +56,22 @@ public boolean setServiceObject( ComponentContextImpl<S> key, T serviceObject )
}

@Override
public T unsetServiceObject(ComponentContextImpl<S> key)
public T ungetServiceObject(ComponentContextImpl<S> key) {
// null operation for singleRefPair
return null;
}

@Override
public void ungetServiceObjects(BundleContext bundleContext)
{
return serviceObjectRef.getAndSet( null );
T service = serviceObjectRef.getAndSet( null );
if (service != null)
{
if (bundleContext != null)
{
bundleContext.ungetService(getRef());
}
}
}

@Override