# HG changeset patch # User kono # Date 1222584396 -32400 # Node ID 1ff8bfc0a99a6455298b5a0d6e7e905cbc000c47 # Parent 30c993e89286ef96260cd316d00d61310739e9b6 *** empty log message *** diff -r 30c993e89286 -r 1ff8bfc0a99a rep/SessionManager.java --- a/rep/SessionManager.java Sun Sep 28 15:41:42 2008 +0900 +++ b/rep/SessionManager.java Sun Sep 28 15:46:36 2008 +0900 @@ -106,7 +106,7 @@ } } - private boolean checkSend() { + private boolean checkSend() throws IOException { for(Iterator it = waitingCommandInMerge.iterator(); it.hasNext();){ PacketSet p = it.next(); if(p.getEditor().isMerging()) { @@ -155,7 +155,7 @@ channel.register(selector, ops, handler); } - public void manage(REPSocketChannel channel, REPCommand receivedCommand) { + public void manage(REPSocketChannel channel, REPCommand receivedCommand) throws IOException { if(receivedCommand == null) return; //Session session; REPCommand sendCommand = new REPCommand(receivedCommand); @@ -377,6 +377,7 @@ { //sid から Session を取得 Session session = getSession(receivedCommand.sid); + if (session==null) throw new IOException(); //マージの処理と次のエディタへコマンドを送信する処理 session.translate(channel, receivedCommand);