summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose <pepone@users.noreply.github.com>2021-07-13 14:48:00 +0200
committerGitHub <noreply@github.com>2021-07-13 14:48:00 +0200
commita2cc2546450aba26baca06a9226d9f70f8c791b4 (patch)
tree61de60e9c8935275756e8cd3db87ea9076f46b63
parentLock subscription mutex around optional trace logs (#1260) (diff)
downloadice-3.6.tar.bz2
ice-3.6.tar.xz
ice-3.6.zip
Fix null reference skipping optional class (#1296) - fixes #12953.6
-rw-r--r--js/package.json2
-rw-r--r--js/src/Ice/BasicStream.js2
2 files changed, 2 insertions, 2 deletions
diff --git a/js/package.json b/js/package.json
index ae94406995f..77c97b58614 100644
--- a/js/package.json
+++ b/js/package.json
@@ -1,6 +1,6 @@
{
"name": "ice",
- "version": "3.6.5",
+ "version": "3.6.5-1",
"description": "Ice for JavaScript runtime",
"author": "Zeroc, Inc.",
"homepage": "https://zeroc.com",
diff --git a/js/src/Ice/BasicStream.js b/js/src/Ice/BasicStream.js
index f3f04408b7e..6e269f8feb6 100644
--- a/js/src/Ice/BasicStream.js
+++ b/js/src/Ice/BasicStream.js
@@ -2572,7 +2572,7 @@ var BasicStream = Class({
//
this._readEncapsStack.decoder.readObject.call(
this._readEncapsStack.decoder,
- function(obj){
+ patcher === null ? null : function(obj){
if(obj !== null && !(obj.ice_instanceof(T)))
{
ExUtil.throwUOE(T.ice_staticId(), obj);