# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marian.edu@acorn.ro-20210423120635-qu022uqwhftsh8ej
# target_branch: sftp://medu@xfer.goldencode.com/opt/fwd/3821c
# testament_sha1: 46c2975b9115edb4f377880391206b1cd8acfe1d
# timestamp: 2021-05-04 14:57:41 +0300
# source_branch: 4335a
# base_revision_id: ca@goldencode.com-20210323115539-tuxqia3wn5i7l5rf
#
# Begin patch
=== modified file 'rules/include/common-progress.rules'
--- rules/include/common-progress.rules 2021-02-16 18:01:41 +0000
+++ rules/include/common-progress.rules 2021-04-23 12:06:35 +0000
@@ -10068,6 +10068,8 @@
ovrdNames.put("net.http.filter.ifilterevents", "IFilterEvents")
ovrdNames.put("reflect.constructor", "LegacyConstructor")
ovrdNames.put("reflect.method", "Legacy4GLMethod")
+ ovrdNames.put("logging.isupportlogging", "ISupportLogging")
+ ovrdNames.put("web.webrequest", "RemoteWebRequest")
=== modified file 'src/com/goldencode/p2j/oo/core/ByteBucket.java'
--- src/com/goldencode/p2j/oo/core/ByteBucket.java 2021-03-10 10:53:37 +0000
+++ src/com/goldencode/p2j/oo/core/ByteBucket.java 2021-03-25 08:48:03 +0000
@@ -16,6 +16,7 @@
** 007 CA 20210221 Fixed 'qualified', 'extent' and 'returns' annotations at the legacy
** signature.
** ME 20210310 Use object variables defined out of block for methods that returns objects.
+** ME 20210325 Move assert inside block else initInput returns an invalid `object`.
*/
/*
@@ -924,10 +925,11 @@
@LegacyResourceSupport(supportLvl = CVT_LVL_FULL | RT_LVL_FULL)
public void putString(final object extends LegacyString> _data)
{
- Assert.notNull(_data, new character("String data"));
object extends LegacyString> data = TypeFactory.initInput(_data);
internalProcedure(this, "PutString", new Block((Body) () -> {
+ Assert.notNull(data, new character("String data"));
+
putString(data.ref().getValue(), new longchar(data.ref().getEncoding()));
}));
}
=== modified file 'src/com/goldencode/p2j/oo/core/collections/LegacyCollection.java'
--- src/com/goldencode/p2j/oo/core/collections/LegacyCollection.java 2021-02-23 07:39:32 +0000
+++ src/com/goldencode/p2j/oo/core/collections/LegacyCollection.java 2021-03-25 06:52:49 +0000
@@ -10,6 +10,7 @@
**
** 003 CA 20210221 Fixed 'qualified', 'extent' and 'returns' annotations at the legacy
** signature.
+** 004 ME 20210325 Decrement object reference when removed from collection.
*/
/*
@@ -342,6 +343,10 @@
return function(this, "Remove", logical.class, new Block((Body) () -> {
object extends _BaseObject_> match = _find(p1);
+ if (match._isValid())
+ {
+ ObjectOps.decrement(match.ref());
+ }
returnNormal(match._isValid() && objects.remove(match));
}));
@@ -360,7 +365,11 @@
{
LegacyCollection other = ObjectOps.cast(p1, LegacyCollection.class).ref();
- List> matches = other.objects.stream().map(o -> _find(o)).filter(o -> o._isValid()).collect(Collectors.toList());
+ List