Skip to content

Commit 763ab23

Browse files
committed
add missing boundary
1 parent 35ff4ba commit 763ab23

File tree

2 files changed

+8
-19
lines changed

2 files changed

+8
-19
lines changed

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/SocketModuleBuiltins.java

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -589,27 +589,14 @@ Object close(VirtualFrame frame, int fd) {
589589
throw raiseOSError(frame, OSErrorEnum.EBADF.getNumber());
590590
}
591591

592-
if (socket.getSocket() != null) {
593-
if (!socket.getSocket().isOpen()) {
594-
throw raiseOSError(frame, OSErrorEnum.EBADF.getNumber());
595-
}
596-
597-
try {
598-
socket.getSocket().close();
599-
} catch (IOException e) {
600-
throw raiseOSError(frame, OSErrorEnum.EBADF.getNumber());
601-
}
592+
if (!socket.isOpen()) {
593+
throw raiseOSError(frame, OSErrorEnum.EBADF.getNumber());
602594
}
603-
else if (socket.getServerSocket() != null) {
604-
if (!socket.getServerSocket().isOpen()) {
605-
throw raiseOSError(frame, OSErrorEnum.EBADF.getNumber());
606-
}
607595

608-
try {
609-
socket.getServerSocket().close();
610-
} catch (IOException e) {
611-
throw raiseOSError(frame, OSErrorEnum.EBADF.getNumber());
612-
}
596+
try {
597+
socket.close();
598+
} catch (IOException e) {
599+
throw raiseOSError(frame, OSErrorEnum.EBADF.getNumber());
613600
}
614601
getContext().getResources().close(socket.getFileno());
615602
return PNone.NONE;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/socket/PSocket.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,10 +180,12 @@ public void setBlocking(boolean blocking) {
180180
this.blocking = blocking;
181181
}
182182

183+
@TruffleBoundary
183184
public boolean isOpen() {
184185
return getSocket() != null && getSocket().isOpen();
185186
}
186187

188+
@TruffleBoundary
187189
public void close() throws IOException {
188190
if (getSocket() != null) {
189191
getSocket().close();

0 commit comments

Comments
 (0)