Skip to content

Commit 5f56b40

Browse files
michaeloffnermichaeloffner
committed
Merge branch '7.0' into 7.1
# Conflicts: # core/src/main/java/lucee/transformer/library/ClassDefinitionImpl.java # loader/build.xml # loader/pom.xml
1 parent 3da78ee commit 5f56b40

File tree

3 files changed

+121
-133
lines changed

3 files changed

+121
-133
lines changed

‎core/src/main/java/lucee/runtime/ComponentPageImpl.java‎

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@
2424
import java.nio.charset.Charset;
2525
import java.util.ArrayList;
2626
import java.util.Arrays;
27-
import java.util.Collections;
2827
import java.util.Iterator;
29-
import java.util.LinkedHashMap;
3028
import java.util.List;
3129
import java.util.Map;
3230
import java.util.Map.Entry;
@@ -107,7 +105,8 @@ public abstract class ComponentPageImpl extends ComponentPage {
107105
public static final lucee.runtime.type.Collection.Key REMOTE_PERSISTENT_ID = KeyConstants._Id16hohohh;
108106

109107
// Note: Static property registry is now generated per-class in bytecode, not in base class
110-
// Each generated component class has its own __staticProperties field and __getStaticProperties() method
108+
// Each generated component class has its own __staticProperties field and __getStaticProperties()
109+
// method
111110
// See PageImpl.writeOutStatic() for bytecode generation
112111

113112
private long lastCheck = -1;
@@ -605,8 +604,7 @@ private void _callRest(PageContext pc, Component component, UDF udf, String path
605604
pc.forceWrite(content);
606605
hasContent = true;
607606
}
608-
catch (IOException e) {
609-
}
607+
catch (IOException e) {}
610608
}
611609
}
612610

@@ -802,8 +800,7 @@ else if (args instanceof String) {
802800
try {
803801
args = new CFMLExpressionInterpreter().interpret(pc, str);
804802
}
805-
catch (PageException _pe) {
806-
}
803+
catch (PageException _pe) {}
807804
}
808805
}
809806
}
@@ -1156,9 +1153,9 @@ public StaticStruct getStaticStruct() {
11561153
}
11571154

11581155
/**
1159-
* Returns the static properties map for this component class.
1160-
* Components with properties will override this method to return their static property registry.
1161-
* Default implementation returns null for components without properties.
1156+
* Returns the static properties map for this component class. Components with properties will
1157+
* override this method to return their static property registry. Default implementation returns
1158+
* null for components without properties.
11621159
*
11631160
* @return Map of property names to PropertyImpl instances, or null if no properties
11641161
*/
@@ -1167,9 +1164,9 @@ public Map<String, lucee.runtime.component.PropertyImpl> getStaticProperties() {
11671164
}
11681165

11691166
/**
1170-
* LDEV-3335: Returns the static flyweight accessor UDF map for this component class.
1171-
* Components with accessors will override this to return their static UDF registry.
1172-
* Default implementation returns null for components without accessor UDFs.
1167+
* LDEV-3335: Returns the static flyweight accessor UDF map for this component class. Components
1168+
* with accessors will override this to return their static UDF registry. Default implementation
1169+
* returns null for components without accessor UDFs.
11731170
*
11741171
* @return Map of accessor names to UDF instances, or null if no accessor UDFs
11751172
*/
@@ -1178,9 +1175,9 @@ public Map<Key, UDF> getStaticAccessorUDFs() {
11781175
}
11791176

11801177
/**
1181-
* Initializes component properties from the static property registry.
1182-
* Components with properties will override this method to provide optimized property initialization.
1183-
* Default implementation does nothing (no-op for components without properties).
1178+
* Initializes component properties from the static property registry. Components with properties
1179+
* will override this method to provide optimized property initialization. Default implementation
1180+
* does nothing (no-op for components without properties).
11841181
*
11851182
* @param impl The ComponentImpl instance to initialize properties for
11861183
* @throws PageException if property initialization fails

‎core/src/main/java/lucee/runtime/config/ConfigAdmin.java‎

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1710,8 +1710,7 @@ private void _removeJDBCDriver(ClassDefinition cd) throws PageException {
17101710
try {
17111711
OSGiUtil.uninstall(bl);
17121712
}
1713-
catch (BundleException e) {
1714-
}
1713+
catch (BundleException e) {}
17151714
}
17161715
}
17171716
}
@@ -1742,8 +1741,7 @@ private void _removeStartupHook(ClassDefinitionImpl cd) throws PageException {
17421741
try {
17431742
OSGiUtil.uninstall(bl);
17441743
}
1745-
catch (BundleException e) {
1746-
}
1744+
catch (BundleException e) {}
17471745
}
17481746
}
17491747
}
@@ -1778,8 +1776,7 @@ private void unloadStartupIfNecessary(ConfigPro config, ClassDefinition<?> cd, b
17781776
}
17791777
config.getStartups().remove(cd.getClassName());
17801778
}
1781-
catch (Exception e) {
1782-
}
1779+
catch (Exception e) {}
17831780
}
17841781

17851782
public void updateJDBCDriver(String label, String id, ClassDefinition cd, String connectionString) throws PageException {
@@ -1830,8 +1827,7 @@ private void _updateJDBCDriver(String label, String id, ClassDefinition cd, Stri
18301827
try {
18311828
OSGiUtil.uninstall(bl);
18321829
}
1833-
catch (BundleException e) {
1834-
}
1830+
catch (BundleException e) {}
18351831
}
18361832
}
18371833
}
@@ -5030,7 +5026,7 @@ private void unSyncUpdateExtension(Config config, RHExtension rhext, ResetFilter
50305026
Map<String, String> map;
50315027
while (itl.hasNext()) {
50325028
map = itl.next();
5033-
ClassDefinitionImpl cd = ClassDefinitionImpl.toClassDefinition(map, false, config.getIdentification());
5029+
ClassDefinitionImpl cd = (ClassDefinitionImpl) ClassDefinitionImpl.toClassDefinition(map, false, config.getIdentification());
50345030
String cfc = map.get("component");
50355031

50365032
// class
@@ -5046,11 +5042,12 @@ else if (!StringUtil.isEmpty(cfc, true)) {
50465042
filter.add("resetStartups");
50475043
reloadNecessary = true;
50485044
logger.info("extension", "Update Startup Hook [" + cfc + "] from extension [" + rhext.getMetadata().getName() + ":" + rhext.getVersion() + "]");
5049-
}
5045+
}
50505046
// neither valid class nor component - log error
50515047
else {
5052-
logger.error("extension", "Startup Hook from extension [" + rhext.getMetadata().getName() + ":" + rhext.getVersion()
5053-
+ "] could not be registered: class definition [" + cd + "] is not a valid OSGi bundle (missing bundle-name/bundle-version?) and no component specified");
5048+
logger.error("extension",
5049+
"Startup Hook from extension [" + rhext.getMetadata().getName() + ":" + rhext.getVersion() + "] could not be registered: class definition [" + cd
5050+
+ "] is not a valid OSGi bundle (missing bundle-name/bundle-version?) and no component specified");
50545051
}
50555052
}
50565053
}
@@ -5456,7 +5453,7 @@ private void unSyncRemoveExtension(Config config, RHExtension rhe, RHExtension r
54565453
Map<String, String> map;
54575454
while (itl.hasNext()) {
54585455
map = itl.next();
5459-
ClassDefinitionImpl cd = ClassDefinitionImpl.toClassDefinition(map, false, config.getIdentification());
5456+
ClassDefinitionImpl cd = (ClassDefinitionImpl) ClassDefinitionImpl.toClassDefinition(map, false, config.getIdentification());
54605457
String cfc = map.get("component");
54615458

54625459
if (cd != null && (cd.isBundle() || cd.isMaven())) {
@@ -6218,7 +6215,7 @@ private boolean _removeContext(Config config, String realpath, boolean _store) t
62186215
Resource context = config.getConfigDir().getRealResource("context");
62196216
Resource trg = context.getRealResource(realpath);
62206217
if (trg.exists()) {
6221-
LogUtil.log( config, Log.LEVEL_INFO, "deploy", "_removeContext() removing: " + trg.getAbsolutePath() );
6218+
LogUtil.log(config, Log.LEVEL_INFO, "deploy", "_removeContext() removing: " + trg.getAbsolutePath());
62226219
trg.remove(true);
62236220
if (_store) ConfigAdmin._storeAndReload((ConfigPro) config);
62246221
ResourceUtil.removeEmptyFolders(context, null);
@@ -6602,8 +6599,7 @@ public BundleDefinition[] _updateExtension(ConfigPro config, RHExtension ext) th
66026599
return old;
66036600
}
66046601
}
6605-
catch (Exception ee) {
6606-
}
6602+
catch (Exception ee) {}
66076603
}
66086604
}
66096605
catch (Exception e) {

0 commit comments

Comments
 (0)