From e6bf8cad947a0919c2cba9c248b351112e65f7f6 Mon Sep 17 00:00:00 2001
From: rudolfkoenig <>
Date: Wed, 25 Mar 2020 23:27:16 +0000
Subject: [PATCH] 10_MQTT2_DEVICE.pm: fix parsing of {}

git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@21518 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 FHEM/10_MQTT2_DEVICE.pm | 2 +-
 fhem.pl                 | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/FHEM/10_MQTT2_DEVICE.pm b/FHEM/10_MQTT2_DEVICE.pm
index 6dd106374..f3c7b29cd 100644
--- a/FHEM/10_MQTT2_DEVICE.pm
+++ b/FHEM/10_MQTT2_DEVICE.pm
@@ -442,7 +442,7 @@ MQTT2_DEVICE_Attr($$)
       return "$dev attr $attrName: more parameters needed" if(!$par2);
 
       if($atype eq "reading") {
-        if($par2 =~ m/^{.*}\s+$/) {
+        if($par2 =~ m/^{.*}\s*$/) {
           my $ret = perlSyntaxCheck($par2, 
                 ("%TOPIC"=>1, "%EVENT"=>"0 1 2 3 4 5 6 7 8 9",
                  "%NAME"=>$dev, "%CID"=>"clientId",
diff --git a/fhem.pl b/fhem.pl
index cb2bb96aa..300169925 100755
--- a/fhem.pl
+++ b/fhem.pl
@@ -5262,7 +5262,7 @@ hashKeyRename($$$)
     my $val = $hash->{$k};
     next if($k !~ m/$r2/ || !defined($repl{$1}));
     $k =~ s/$r2/$repl{$1}/;
-    $ret{makeReadingName($k)} = $val;
+    $ret{$k} = $val;
   }
   return \%ret;
 }
@@ -5285,7 +5285,7 @@ json2reading($$;$$$)
   if($ret && ref $ret eq "HASH") {
     readingsBeginUpdate($hash);
     foreach my $k (keys %{$ret}) {
-      readingsBulkUpdate($hash, $k, $ret->{$k});
+      readingsBulkUpdate($hash, makeReadingName($k), $ret->{$k});
     }
     readingsEndUpdate($hash, 1);
   }