Merge pull request #191 from GreenTeaProgrammers/fix/frontend/guardia…

…n/close-cahnnel fix: channelを閉じる場所を修正
GreenTeaProgrammers · Feb 23, 2024 · a968844 · a968844
2 parents e361217 + 7719dbb
commit a968844
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/frontend/where_child_bus_guardian/lib/util/api/guardian.dart b/frontend/where_child_bus_guardian/lib/util/api/guardian.dart
@@ -28,8 +28,9 @@ Future<GuardianLoginResponse> guardianLogin(
     return res;
   } catch (error) {
     developer.log("Caught Error", error: error);
-    await channel.shutdown();
     return Future.error(error);
+  } finally {
+    await channel.shutdown();
   }
 }
 

diff --git a/frontend/where_child_bus_guardian/lib/util/api/health_check.dart b/frontend/where_child_bus_guardian/lib/util/api/health_check.dart
@@ -22,7 +22,8 @@ Future<PingResponse> serviceHealthCheck() async {
     return res;
   } catch (error) {
     developer.log('Caught error: $error');
-    await channel.shutdown();
     return Future.error(error);
+  } finally {
+    await channel.shutdown();
   }
 }