X-Git-Url: http://git.indexdata.com/?p=yazproxy-moved-to-github.git;a=blobdiff_plain;f=src%2Fyaz-proxy.cpp;h=45fe382e9b9a772b0f8fa8b4c5e1b197e0259356;hp=9280b839701b1b0dca3ce9d84f0cd43741f2379e;hb=094d6eb1e3f699fee222a542eda4959e58f7a3cb;hpb=ee8cfba95daa813ea4dd66ba9e99066db5e5b967

diff --git a/src/yaz-proxy.cpp b/src/yaz-proxy.cpp
index 9280b83..45fe382 100644
--- a/src/yaz-proxy.cpp
+++ b/src/yaz-proxy.cpp
@@ -1,4 +1,4 @@
-/* $Id: yaz-proxy.cpp,v 1.30 2005-06-08 13:29:03 adam Exp $
+/* $Id: yaz-proxy.cpp,v 1.31 2005-06-10 17:54:11 adam Exp $
    Copyright (c) 1998-2005, Index Data.
 
 This file is part of the yaz-proxy.
@@ -2682,13 +2682,15 @@ void Yaz_Proxy::handle_init(Z_APDU *apdu)
 	m_initRequest_maximumRecordSize = *apdu->u.initRequest->
 	    maximumRecordSize;
 	*apdu->u.initRequest->maximumRecordSize = 1024*1024;
+
+	Z_CharSetandLanguageNegotiation *charSetandLangRecord =
+	    yaz_get_charneg_record(*oi);
 	
 	// Save proposal charsets and langs.
 	if (ODR_MASK_GET(apdu->u.initRequest->options,
-			 Z_Options_negotiationModel))
+			 Z_Options_negotiationModel) 
+	    && charSetandLangRecord)
 	{
-	    Z_CharSetandLanguageNegotiation *charSetandLangRecord =
-		yaz_get_charneg_record(*oi);
 	    
 	    yaz_get_proposal_charneg(m_referenceId_mem,
 				     charSetandLangRecord,